cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,914 Commits 10 Branches 0 Tags
64c59d3145f457aca351bc4782f050a1bff9e657
Commit Graph

19529 Commits

Author SHA1 Message Date
SomeoneElse
64c59d3145 replace \red usages with various <span> usages in runes.dm 
code/game/gamemodes/cult/rules.dm:
	replaced {\red,\b} with <span class='{danger,warning,cult}'>.
	added some span class guidelines esp. on cult for future consistency.
 2015-08-10 12:58:37 +03:00
mwerezak
c98b6a1d97 Merge pull request #10457 from Zuhayr/dev-freeze 
Custom item rolldown.
 2015-08-09 10:33:54 -04:00
mwerezak
15cbd0e0a2 Merge pull request #10461 from PsiOmegaDelta/150809-ExplosionGarbage 
Explosion particle GC.
 2015-08-09 09:36:54 -04:00
GinjaNinja32
575ab793a2 Merge pull request #10458 from PsiOmegaDelta/150809-DestroyBuildings 
Fixes #10217.
 2015-08-09 12:43:08 +01:00
PsiOmega
d1a4f4b0a4 Compilation fixes and partial revert of #10456. 2015-08-09 13:27:59 +02:00
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-08-09 13:15:22 +02:00
PsiOmega
6a15611711 Explosion particle GC. 
Explosion particles cheated, only nulling the location and hoping to get collected one day.
 2015-08-09 12:35:07 +02:00
PsiOmega
e350d888e6 Fixes #10217. 
Adds destroys to rectify the situation.
 2015-08-09 10:52:24 +02:00
PsiOmegaDelta
31b8335298 Merge pull request #10456 from mwerezak/air-alarm 
Fixes
 2015-08-09 10:09:02 +02:00
Zuhayr
b6e6d45952 Small tweaks to get rolldowns to work properly. 2015-08-09 17:01:07 +09:30
Zuhayr
aed2ac3dfe Moved custom_synthetic.dmi into a proper define. 2015-08-09 16:48:20 +09:30
Zuhayr
9d11a367a6 Roll-down-jumpsuit now works properly with custom items, icon_override and (hopefully) species variants. 2015-08-09 16:22:19 +09:30
mwerezak
b1b3b4899b Fixes #7928 
Uses camera/set_status() to ensure viewers are kicked and camera cache updated.
 2015-08-09 00:24:18 -04:00
mwerezak
83abfcf7af Fixes #9594 
Areas now initialize to having all power channels off.
 2015-08-09 00:02:50 -04:00
mwerezak
1486876e73 Fixes #10449 
Reimpements trace gas checking for air alarms. Removes duplicate danger level checking in air alarm nanoui code, as all of that is already calculated as part of air alarm processing.
 2015-08-08 23:59:38 -04:00
PsiOmegaDelta
4ae754a59d Merge pull request #10454 from mwerezak/chem-machine-fix 
Fixes #10021
 2015-08-08 19:16:47 +02:00
PsiOmegaDelta
431cc254cd Merge pull request #10453 from mwerezak/robotlang-fix 
Fixes #9966
 2015-08-08 19:16:40 +02:00
PsiOmegaDelta
22c500ed2b Merge pull request #10452 from mwerezak/stump-fix 
Backports #10331
 2015-08-08 19:16:25 +02:00
mwerezak
4e70cc03bc Fixes #10021 2015-08-08 11:38:27 -04:00
mwerezak
1e3d3101de Fixes #9966 2015-08-08 11:28:22 -04:00
Kearel
4139a51946 Initial fixes 
Changes interaction between stumps and items.

Conflicts:
	code/modules/organs/organ_stump.dm
 2015-08-08 11:10:28 -04:00
mwerezak
d9ee308dbe Merge pull request #10450 from GinjaNinja32/syndicate-beacon 
Fix inverted arguments in syndicate beacon self-destruct
 2015-08-08 10:59:15 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
GinjaNinja32
c1675bb32b Fix inverted arguments in syndicate beacon self-destruct 
Far less likely to gib people now.
 2015-08-07 23:11:50 +01:00
HarpyEagle
fc7e89380e More material renames 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
 2015-08-07 17:10:35 -04:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy() 
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
 2015-08-06 08:39:24 +02:00
PsiOmegaDelta
87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision 
Adds nightvision to cult constructs
 2015-08-06 06:38:49 +02:00
mwerezak
0bc9468022 Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime 
Fixes holodeck runtime.
 2015-08-05 23:06:04 -04:00
mwerezak
e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze 
Refactors floating and magboot checks. Fixes #10256
 2015-08-05 23:05:34 -04:00
PsiOmegaDelta
cf1ffd273a Fixes holodeck runtime. 
initial() doesn't work well with lists. Causes a null value.
 2015-08-05 09:33:34 +02:00
PsiOmegaDelta
6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32
595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
Chinsky
7a4ba68abe Merge pull request #10419 from mwerezak/gamemode 
Fixes #10403
 2015-08-04 17:08:51 +03:00
GinjaNinja32
117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS 
Of bots and ZAS
 2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky 
Fixes #10355
 2015-08-04 12:36:35 +01:00
Kelenius
e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
mwerezak
d1bd146b1a Changes reinforced glass material name 
Gives the reinforced glass material a name that is easier to verify for
correctness.
 2015-08-03 23:01:34 -04:00
mwerezak
d25d0c700c Fixes #10403 
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
 2015-08-03 20:01:55 -04:00
GinjaNinja32
70c302ad03 Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime 
Fixes #10409.
 2015-08-04 00:47:11 +01:00
GinjaNinja32
a099fc4401 Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup 
Removes debug proc.
 2015-08-04 00:46:40 +01:00
mwerezak
76ceaa904b Fixes admin or event spawned antags not spawning 
Pending players were selected but the antag roles were never finalized.
 2015-08-03 12:06:23 -04:00
mwerezak
2e1607f611 Fixes #10414 
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
 2015-08-03 12:03:08 -04:00
RavingManiac
aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta
c25212463a Fixes #10409. 
Ports https://github.com/ParadiseSS13/Paradise/pull/1622.
 2015-08-03 10:15:24 +02:00
PsiOmegaDelta
34ad83baae Removes debug proc. 
It isn't needed.
 2015-08-03 09:31:40 +02:00
PsiOmegaDelta
998b72bcd8 Fixes #10372. 
Removes snowflake attack code.
 2015-08-03 09:20:36 +02:00
Atlantis
ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
mwerezak
8f4394266b Fixes not being able to insert a complete stack into the protolathe 
The call order meant that if you tried to insert a complete stack, use()
would qdel the stack causing do_after() to fail.
 2015-08-02 00:26:30 -04:00
mwerezak
2f20f0c537 Fixes #10249 
Moves the isrobot() check so that it only applies to robots interacting
with doors to open them.
 2015-08-02 00:02:33 -04:00