Commit Graph

4878 Commits

Author SHA1 Message Date
Miauw62 95733ee3ea Merge pull request #3280 from MrPerson/mining_vouchers
Fix the "use mining voucher many times" bug
2014-04-05 19:00:35 +02:00
Miauw62 ab181299dd Merge pull request #3279 from fleure/braid
Fixes floorlength braid sprite
2014-04-05 18:48:02 +02:00
Miauw62 39a077761c Merge pull request #3264 from Menshin/Wizarditis_and_inv
Fixed "update inventory X" procs and clothes from wizarditis not showing
2014-04-05 18:43:40 +02:00
Miauw62 732e02d393 Merge pull request #3302 from MrPerson/qdel_runtime_disposal
Fixes for a disposal runtime everytime something got flushed
2014-04-05 18:09:04 +02:00
Miauw62 9bdb8b0e96 Merge pull request #3309 from Krypt0n33/human-burger-fix-2
Fixes #3293
2014-04-05 18:04:41 +02:00
Miauw62 52ecffde76 Merge pull request #3306 from Aranclanos/DisposalAir
Fixes issue #2330. Disposals not activating the turf air.
2014-04-05 17:59:19 +02:00
Razharas 5626ad9bbc Merge pull request #3275 from Aranclanos/TeleportersFix
Fixes and some minor changes regarding teleports/portals code.
2014-04-03 22:05:45 -07:00
Krypt0n aa80ee0f29 human-burgers now eject correctly 2014-04-03 22:50:02 +02:00
Aranclanos e3836fa43e Fixes issue #2330
Makes disposal outlets activate the turf once they eject air to it.
2014-04-03 16:07:40 -03:00
Miauw62 6748fafb52 Merge pull request #3248 from AnturK/nothinglikeasmellofplasmainthemorning
Fix for freezing plasma from chemistry
2014-04-03 20:43:17 +02:00
MrPerson a3016c8229 Fixes for a disposal runtime everytime something got flushed 2014-04-03 11:02:32 -07:00
Razharas 1098b7e498 Merge branch 'master' of https://github.com/tgstation/-tg-station into RDfix 2014-04-03 15:38:07 +04:00
Razharas f7e3737f3f Span classes yaaaaay 2014-04-03 15:37:53 +04:00
ikarrus f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
ikarrus f705141fce Resolved Conflicts:
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
Razharas 5b815c8d01 Merge pull request #3267 from Cheridan/Singu
Improved Singularity Ex_act()
2014-04-02 16:52:15 -07:00
Miauw 1b10254a25 Reverts my and Incoming's April Fools 2014-04-02 20:03:17 +02:00
Razharas c61fcbd5ed Merge pull request #3230 from Donkie/foodmask
You can no longer eat/drink or consume pills while having a mask/helmet covering your mouth.
2014-04-02 10:31:32 -07:00
Giacomand e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
MrPerson 157818b9b0 Fix the "use mining voucher many times" bug 2014-04-02 07:56:03 -07:00
fleure 19f7c691d6 Fixes floorlength braid sprite 2014-04-02 15:38:17 +01:00
Aranclanos fc915bf800 If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
Fixes issue #2236.
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
Cheridan 412ac0fb38 Improved Singularity Ex_act() 2014-04-01 15:26:48 -05:00
Miauw62 24e1e89afb Merge pull request #3260 from Incoming5643/Realism
Minor fix to improve realism
2014-04-01 19:55:33 +02:00
Menshin f411ccaad6 * Fixed the update_inv_* functions to actually update the inventory HUD even if the inventory is closed (that should fix items presents in the inventory but invisible).
* Fixed clothes from wizarditis not appearing on character and inventory.
2014-04-01 19:33:38 +02:00
Razharas e86ab01626 Fixes R&D machinery materials adding exploit
Fixes https://github.com/tgstation/-tg-station/issues/3259
2014-04-01 21:21:08 +04:00
Incoming af47580b20 Humans Named John McClane can crawl through the vents.
This helps increase realism and believability in our 2D spessman games.
2014-04-01 12:45:28 -04:00
Razharas f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian
April fools
2014-04-01 05:54:22 -07:00
Miauw62 823c59502f Merge pull request #3234 from Rockdtben/fixAdminDB
hue
2014-04-01 14:21:34 +02:00
Cheridan 302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
2014-04-01 01:27:39 -05:00
Aranclanos 6c1150dca3 Merge pull request #3143 from Malkevin/saccult
Sacrifice Cult
2014-04-01 02:18:39 -03:00
MrStonedOne 25fe463eb2 Ensures re-humaned cyborgs get normal macros. 2014-03-31 22:04:33 -07:00
Cheridan 222f769b0c Merge pull request #3091 from Incoming5643/diehardwithaventgeance
Fixes #3084
2014-03-31 21:39:32 -05:00
Cheridan 8b8e7e8a24 Merge pull request #3204 from MrPerson/disposal_verb_tab
Move disposal pipe verbs to the object tab
2014-03-31 21:37:49 -05:00
Malkevin a35f993c69 Changed the fast move code from a bunch of has_reagents checks to a bitflag check.
The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
2014-04-01 00:50:42 +01:00
Cheridan d92fae006d Merge pull request #3189 from Kelenius/master
Hydroponics fixes, #2992, #3002, chemicals, attackby()
2014-03-31 17:58:10 -05:00
Malkevin 0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
AnturK 5dccede8cf Fix for freezing plasma from chemistry 2014-03-31 22:09:21 +02:00
fleure d38a85bcc0 Merge pull request #3231 from phil235/AddDesigns2
Adding four boards to the list of R&D circuit designs
2014-03-31 19:42:26 +01:00
fleure cccb3dcf76 Merge pull request #3226 from Giacom/syndicate_fab
Syndicate Suit Fashion
2014-03-31 19:35:45 +01:00
fleure db1ac17930 Merge pull request #3214 from Niknakflak/Lasertagequipment
Adds Laser Tag Equipment set to admin verb: "Select Equipment"
2014-03-31 19:27:21 +01:00
Incoming 335c4591ad Just uses Login() 2014-03-31 13:30:19 -04:00
Aranclanos b84d47717d Merge pull request #3191 from Steelpoint/LaserChange
Laser Gun Ammo Buff + Sprite Change for Red Laser Tag
2014-03-31 14:02:21 -03:00
Razharas d1fbcf2457 Merge pull request #3227 from fleure/tankfix
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
MrPerson e2defa667a Upgrades to the play admin midi client pref
Toggling it off will pause any songs currently playing. Toggling it back on will resume playback from where you were.
Toggling midis on will play the currently playing admin midi, if there is one.
2014-03-31 05:41:33 -07:00
Steelpoint fd32b3ebda Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo 2014-03-31 15:49:08 +08:00
Miauw 83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Rockdtben 117b51be0e Added a better error message 2014-03-29 16:58:55 -05:00
Rockdtben 3d0d5b4fb2 Fixed some issues with the DB admin system
-erro_admin_ranks table did not exist
-passing a string in to admin new instead of a rank.
2014-03-29 16:56:42 -05:00
Razharas ee7f6c314d Merge pull request #3222 from phil235/aloefix
Changes Aloe cocktail recipe
2014-03-29 13:36:34 -07:00