Commit Graph

554 Commits

Author SHA1 Message Date
bgobandit edf918282e Tweaks text and numbers. 2015-08-29 19:54:44 -04:00
bgobandit 14d5cb7340 Refactors slime potions. 2015-08-29 02:42:54 -04:00
Aranclanos 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
Swag McYolosteinen 825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
Remie Richards f77047b640 Merge pull request #11185 from Cheridan/brycepaxsbrain
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
Remie Richards 3891e67d8d Merge pull request #11162 from Core0verload/rnd-implants
RnD update
2015-08-18 20:20:12 +01:00
Firecage bf13763e3b Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel 2015-08-16 23:34:03 +02:00
Firecage dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
phil235 5539689f3a Merge pull request #11043 from KorPhaeron/moreweebshit
Timestop for Wizards
2015-08-16 11:04:47 +02:00
KorPhaeron 0abd08cb92 Did it the way Phil wanted it 2015-08-15 22:00:15 -05:00
Swag McYolosteinen 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
Cheridan 5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
KorPhaeron ced06e1a2c Fix 2015-08-13 09:11:19 -06:00
c0 df4d5cfe0d RnD update 2015-08-12 15:18:13 +03:00
Jim Boonie 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
Remie Richards 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
KorPhaeron 2d419a3318 Removed extra loop label 2015-08-05 20:13:04 -05:00
KorPhaeron 6f73d3c9a7 Coding school adventures 2015-08-05 19:20:27 -05:00
KorPhaeron 7fa7be64bc Not sure how half my commit got left out 2015-08-05 19:09:45 -05:00
KorPhaeron 6a71cd2f57 Toki Wo Tomare
ZA WARUDO
2015-08-05 15:54:41 -05:00
francinum 026e20f968 Design Datum fix 2015-08-05 12:48:51 -04:00
Jordie 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
c0 600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
phil235 40a1c3c5de Merge pull request #10935 from bear1ake/ian-stuff
FIX IAN STUFF (paths)
2015-08-01 17:27:36 +02:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
phil235 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
Chiefwaffles 1c59a84660 Dumb byond stuff fixed and merge conflict fixed for the gazillionth time. 2015-07-25 16:19:21 -07:00
Jordie f7e4297273 Merge pull request #10705 from KorPhaeron/golem
Golem Logging
2015-07-25 19:08:56 +10:00
bgobandit 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
Chiefwaffles eaa271b8c2 FIXES A CONFLICT THAT ISN'T EVEN MINE 2015-07-22 17:36:08 -07:00
KorPhaeron 99bfeb75b5 Replaces usr with user 2015-07-21 12:17:46 -05:00
phil235 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
KorPhaeron aa69941ba8 Removes use of objectives, replaces with notes 2015-07-20 06:13:28 -05:00
KorPhaeron 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
Chiefwaffles 2c3db425fa Resolve merge conflict, step 1. 2015-07-16 12:35:58 -07:00
phil235 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
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Chiefwaffles 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
Xhuis 4207de5159 Fixes a typo 2015-07-14 23:22:23 -04:00
phil235 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
Xhuis dc982fe815 Changelog + board added to autolathe 2015-07-11 11:58:41 -04:00
duncathan c3b095a8b3 adds scanners to R&D; adds changelog 2015-07-10 23:15:44 -06:00
Jordie 8bf129cc06 Merge pull request #10336 from AlexanderUlanH/riotshotguns
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10:00
MrStonedOne 0828401db9 Prevents sentience potion from working on monkies
Logic: they can be converted to humans, this be too OP
2015-07-07 13:53:36 -07:00
phil235 ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
Alexander P. Ulan Hernandez f0d70a42b0 Rubber Shotgun Pellets
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
LaharlMontogmmery 9591d2255d Hoping this solves the merge conflict 2015-06-27 19:23:13 +02:00