529059c3f1
Merge pull request #11459 from bgobandit/itsafuckingpotionfuck
...
Refactors slime potions.
2015-08-30 20:34:45 -05:00
d1c417e996
Merge pull request #11416 from xxalpha/airlockQDEL
...
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
edf918282e
Tweaks text and numbers.
2015-08-29 19:54:44 -04:00
14d5cb7340
Refactors slime potions.
2015-08-29 02:42:54 -04:00
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
460c2c290c
Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used.
...
All objects from said relic will spawn at the same time now.
2015-08-25 05:31:02 -03:00
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
f77047b640
Merge pull request #11185 from Cheridan/brycepaxsbrain
...
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02:00
0abd08cb92
Did it the way Phil wanted it
2015-08-15 22:00:15 -05:00
6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
5979ffdec7
Logging Syntax Improvement
2015-08-13 12:14:14 -05:00
ced06e1a2c
Fix
2015-08-13 09:11:19 -06:00
df4d5cfe0d
RnD update
2015-08-12 15:18:13 +03:00
ebea552319
- Rebalances RCD construction costs around metal construction menu cost values
...
- Makes matter cartridges worth twice as much matter as metal/glass sheets
2015-08-08 06:15:35 +12:00
4870122858
Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
...
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
2d419a3318
Removed extra loop label
2015-08-05 20:13:04 -05:00
6f73d3c9a7
Coding school adventures
2015-08-05 19:20:27 -05:00
7fa7be64bc
Not sure how half my commit got left out
2015-08-05 19:09:45 -05:00
6a71cd2f57
Toki Wo Tomare
...
ZA WARUDO
2015-08-05 15:54:41 -05:00
026e20f968
Design Datum fix
2015-08-05 12:48:51 -04:00
d5a88d3f98
Merge pull request #10957 from Core0verload/surgery-organs-implants
...
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
600d424ea5
Moved cyberimplants to internal organs system
2015-08-02 22:28:45 +03:00
40a1c3c5de
Merge pull request #10935 from bear1ake/ian-stuff
...
FIX IAN STUFF (paths)
2015-08-01 17:27:36 +02:00
04f7b3f2de
Surgery, Implants and Organs rework: Phase 1
2015-07-31 22:18:31 +03:00
5af0bdec25
fix ian stuff
2015-07-31 01:18:03 +09:00
e670cec521
Fixes being able to insert sheets into the protolathe from a distance (w/o telekinesis).
...
Removes some unnecessary icon_state stuff, plus moving busy = 0 to after the end of the insertion animation.
2015-07-29 20:31:11 +02:00
1c59a84660
Dumb byond stuff fixed and merge conflict fixed for the gazillionth time.
2015-07-25 16:19:21 -07:00
f7e4297273
Merge pull request #10705 from KorPhaeron/golem
...
Golem Logging
2015-07-25 19:08:56 +10:00
df836d0f73
Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.
2015-07-23 10:49:06 -04:00
eaa271b8c2
FIXES A CONFLICT THAT ISN'T EVEN MINE
2015-07-22 17:36:08 -07:00
99bfeb75b5
Replaces usr with user
2015-07-21 12:17:46 -05:00
452313a5fa
Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
...
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
aa69941ba8
Removes use of objectives, replaces with notes
2015-07-20 06:13:28 -05:00
d8b874fc25
Golem Logging
...
Gives golems the name of their master in an objective so it can be
easily checked by admins when they start punching people to death or by
the golem itself when it forgets after wandering off.
Adds a warning to admins when traitors start creating golems.
Logs who creates golems.
Requested by Ausops
2015-07-19 09:18:34 -05:00
2c3db425fa
Resolve merge conflict, step 1.
2015-07-16 12:35:58 -07:00
34db8dd695
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
d31d1a017a
Adds emag/emp effects, makes AAS fully constructable, adds a circuitboard for the AAS, and adds overlays for announcements/errors.
2015-07-14 20:34:53 -07:00
4207de5159
Fixes a typo
2015-07-14 23:22:23 -04:00
359a270de6
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
dc982fe815
Changelog + board added to autolathe
2015-07-11 11:58:41 -04:00
c3b095a8b3
adds scanners to R&D; adds changelog
2015-07-10 23:15:44 -06:00
8bf129cc06
Merge pull request #10336 from AlexanderUlanH/riotshotguns
...
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10:00
Cheridan
Razharas
c0
bgobandit
xxalpha
Aranclanos
Swag McYolosteinen
Remie Richards
Firecage
phil235
KorPhaeron
Jim Boonie
francinum
Jordie
bear1ake
phil235
Chiefwaffles
Xhuis
duncathan