e1b3815539
Fixes some awful defines to not be hacks
2016-01-22 19:07:37 -08:00
20e647a598
Prefer += to .Add()
...
For @RemieRichards
2016-01-22 20:12:47 -06:00
9274f9a027
Fix conflicts
2016-01-22 19:29:18 -06:00
1599742f7e
Re-structure tgui's ui_act
2016-01-22 19:25:36 -06:00
b2629a56e2
Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes
2016-01-22 19:25:33 -06:00
99e5764719
Refactor pizza_bomb, tweak pizza_bomb sprites
...
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites
Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
909e7dddd7
Fix some small bugs in wire refactor; add all the colors!
2016-01-22 19:22:10 -06:00
87b0857b93
Refactor wire datums
...
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
cda2f26d56
tgui wires initial
2016-01-22 19:13:23 -06:00
14f90d8f1e
Merge pull request #14748 from xxalpha/airlocktiming
...
Changed APC wire pulsing and airlock autoclose() to use timers.
2016-01-22 21:36:56 -03:00
62bcb146f4
Fixes mindswap leaving keyless ghosts
2016-01-22 23:50:16 +01:00
c6e8f6af59
Fixes mindswapping into aghosting admin
2016-01-22 23:16:05 +01:00
f8e429e80a
Changes punch damage from hardcoded values plus a species modifier to species vars.
...
Changes punch stun threshold from a hardcoded value to a species var.
2016-01-21 16:47:13 -05:00
de44d7ec43
Changed APC wire pulsing and airlock autoclose() to use timers.
...
a
round
2016-01-20 21:26:44 +00:00
d2bd6871d5
Merge Conflict Fix
2016-01-20 14:07:14 +02:00
1c34479376
Fix uplink code once and for all
...
Fixes #14733
2016-01-19 16:42:57 -06:00
75755a12b8
Merge pull request #14710 from KorPhaeron/AI_fix
...
Fixes AI not recieving malf powers and cyborgs not recieving 0 law
2016-01-19 07:27:16 -06:00
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
4a617062d8
Refactor uplinks; fix up tooltips and make uplink more interactive
2016-01-18 14:25:52 -06:00
ff5d6292c8
tgui uplinks; repath uplinks
2016-01-18 14:22:00 -06:00
0a7236d955
Allow relabeling any canister; port MULEbot to tgui
2016-01-18 14:21:56 -06:00
76ac836350
Law Fix
2016-01-17 22:17:38 -06:00
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
332bde0f4f
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02:00
28ac3268d1
Merge pull request #14660 from Menshin/flappyflaps
...
Generalized CanAStarPass() to all /obj
2016-01-17 15:33:39 +03:00
828c1ddf2c
* Generalized AStar check for objects preventing passability
...
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616 )
2016-01-16 15:27:31 +01:00
9455ace7b0
Fixes a few more incurable diseases
2016-01-15 14:23:23 -05:00
35f51004af
Fixes dna spread virus being impossible to cure
2016-01-15 14:19:42 -05:00
4aea0db29b
Merge pull request #14120 from duncathan/listmos
...
[READY] Listmos & "Datum Gases"
2016-01-15 11:58:05 +03:00
033aa5d7b0
Update construct_spells.dm
...
Update soulstone.dm
Update constructs.dm
Update construct_spells.dm
Plz compile
Plz
Compile
Update construct_spells.dm
Update soulstone.dm
Update soulstone.dm
Sarawak
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update soulstone.dm
Update constructs.dm
Update constructs.dm
YES! YES! YES!
Update soulstone.dm
2016-01-14 17:32:49 -05:00
e20eee52ad
fixes reconcile_air(); makes gas flow properly through pipes
2016-01-14 14:02:01 -06:00
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
d5086b27b4
fixes space superheating and air canisters not updating icons
2016-01-13 19:22:18 -06:00
5589ac7559
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
...
This reverts commit 52a45b629219b43ba668
2016-01-07 23:15:35 -03:00
deb5405d5b
Merge pull request #14459 from KorPhaeron/fusion
...
Temporary Revert Of Fusion
2016-01-07 13:13:09 -08:00
ff09481e5e
LSG
2016-01-07 01:48:50 -06:00
87b889ca76
Fusion
2016-01-06 18:36:49 -06:00
50ebfa0f17
Merge pull request #14395 from MrStonedOne/nomoreminus1
...
Removes a bunch of sleep(-1) and spawn(-1) from the code
2016-01-05 22:16:17 -06:00
3108162f1d
Merge pull request #14308 from tgstation/duncathan-patch-1
...
Cancelling while adding a custom objective no longer adds a free objective
2016-01-05 04:39:09 -03:00
ede4a3b378
Merge pull request #14335 from KorPhaeron/refunds
...
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
2016-01-05 01:11:26 +01:00
fd80575f38
Removes a bunch of sleep(-1) and spawn(-1) from the code
...
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
2016-01-04 15:17:12 -08:00
421ecbeb9f
Merge pull request #14323 from Shadowlight213/Mindattacklog
...
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
2016-01-04 20:31:37 +01:00
94b003f7a7
Merge pull request #14339 from AnturK/cleaning
...
Removes some unused code
2016-01-04 20:20:18 +01:00
9ee0f50cd9
Merge pull request #14285 from neersighted/tgui_followup
...
tgui followup
2016-01-03 18:00:43 +01:00
89b612ad15
Removes unused ?module? code
2016-01-03 14:55:18 +01:00
8a72f5a55c
Fixes cyborg teleport
2016-01-03 04:11:19 -06:00
5662676e5e
Makes attacks also log to the mob's mind.dm
...
Shows gibbed antags in the check antags panel.
2016-01-02 17:20:19 -08:00
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
f1783bceca
fix #14307
2016-01-02 17:45:30 -06:00
178a8987a7
fixes superheating; makes gas flow
2016-01-02 17:11:51 -06:00
MrPerson
Bjorn Neergaard
AnturK
tkdrg
Nerd Lord
xxalpha
Firecage
duncathan salt
KorPhaeron
Razharas
Menshin
Buggy123
hornygranny
Aranclanos
MrStonedOne
Shadowlight213