Minijar
83113302b9
Adds first aid stations.
2016-02-23 21:13:11 +00:00
Yoshax
969636a0f5
Adds even more underwear
2016-02-23 17:52:41 +00:00
Mark9013100
1928b102e9
Fixes the RIG grenade launcher icon
2016-02-23 09:37:57 -05:00
Neerti
a67b544acd
More work done!
2016-02-22 23:33:19 -05:00
Hubblenaut
491a83ca72
Adds prices for snacks and drinks
2016-02-22 17:34:23 +01:00
Neerti
576615ff79
Merge pull request #1057 from Mark9013100/2/22/2016eboxfixTAKETWO
...
Removes unnecessary line for evidence bag boxes
2016-02-22 06:04:40 -05:00
Mark9013100
c9dfdb74f5
Removes unnecessary line for evidence bag boxes
2016-02-22 05:48:54 -05:00
Mark9013100
6221f69c35
Fixes the description for the Orion trail machine.
2016-02-22 03:29:15 -05:00
Zuhayr
5a5fb216c8
Added legal notice.
2016-02-22 09:40:03 +10:30
Zuhayr
7d83a629b0
Added Cards Against The Galaxy.
2016-02-22 09:40:02 +10:30
Datraen
b4a89e1acf
Merge pull request #1052 from RusskiSam/resting-mice
...
Removes unnecessary code for mouse rest...
2016-02-21 16:52:31 -05:00
RusskiSam
e142728474
Removes unnecessary code for mouse rest...
...
...Or how rookies don't know simple things.
2016-02-22 00:32:53 +03:00
Hubblenaut
68495d8727
Postmerge fixes
2016-02-21 19:31:04 +01:00
Hubblenaut
c22f9b2996
Merge remote-tracking branch 'upstream/master' into cash
2016-02-21 17:48:19 +01:00
Datraen
b154b2c3be
Merge pull request #1000 from RusskiSam/resting-mice
...
Minor - Mouse players can now "rest" properly
2016-02-21 11:35:40 -05:00
Datraen
5cb69f01a3
Merge pull request #1029 from Kelenius/dankMemes
...
Sprites for drying racks, bees for hydroponics
2016-02-21 11:33:16 -05:00
Datraen
9d269ab470
Merge pull request #1033 from Yoshax/burnbabyburn
...
Allows lighting of smokeables on burning people
2016-02-21 11:32:16 -05:00
Datraen
da3b0af760
Merge pull request #1035 from Yoshax/typofix
...
Fixes #1034
2016-02-21 11:31:45 -05:00
Datraen
f9054370c1
Merge pull request #1046 from Sabess/Sab_Thing
...
Maglights 2.0: Conflict Boogaloo
2016-02-21 11:30:34 -05:00
Hubblenaut
60f5358751
All cash now acts like bundles
2016-02-21 17:23:54 +01:00
Hubblenaut
67884b97b5
Adds cash registers and retail scanners
2016-02-21 16:46:56 +01:00
PsiOmegaDelta
36c99aecae
Closet breakout no longer failes early.
...
Caused by req_breakout() always making us quit early if we're already breaking out.
Breakout sound/animation now play after the checks.
Fixes the secure locker break_open() override, which wouldn't update the welded flag and thus keep you imprisoned.
Fixes a couple of bad macros.
2016-02-21 13:57:03 +00:00
PsiOmegaDelta
afdafb3862
Makes the into-resist proc solely responsible for checking click delays.
...
Because it sets the click cooldown itself downstream procs fail when they in turn check the click delay.
Fixes #11839 . Fixes #12062 . Fixes #12114 .
2016-02-21 12:45:01 +00:00
sabess
71d8acc2cb
Fixed the damage again, oops.
2016-02-21 23:06:05 +11:00
sabess
cb1e26ec70
Fixed conflicts with another thing.
2016-02-21 22:48:56 +11:00
Kelenius
8010b014cf
Merge branch 'master' into dankMemes
2016-02-21 14:20:03 +03:00
Neerti
d85b8f95f6
Merge pull request #1044 from Nalarac/master
...
Adds welding goggles to autolathes.
2016-02-21 04:57:55 -05:00
Neerti
c0ad435650
Merge pull request #1043 from Zuhayr/teshfix
...
Fixes halloss and oxyloss for species with low health values.
2016-02-21 04:57:04 -05:00
Neerti
280fad7c0f
Merge pull request #1045 from Woodratt/1.4.7_bar_hotfix
...
1.4.7 Bar Nerfs
2016-02-21 04:56:41 -05:00
Neerti
93dd32f1b2
Merge pull request #1037 from Yoshax/dolladolla
...
Changes predefined space cash stacks to be bundles
2016-02-21 04:48:00 -05:00
Zuhayr
ebd2360f43
Merge pull request #1004 from Kelenius/master
...
Monkey cubes now expand in showers
2016-02-21 17:49:46 +10:30
Zuhayr
560e6a0ffc
Merge pull request #992 from Neerti/2/14/2016_ling_nerfs_and_ear_protection_cleanup
...
Ling nerfs, ear protection cleanup, and ling bugfixes.
2016-02-21 17:48:44 +10:30
woodratt
7b1b4d081b
1.4.7 Bar Nerfs
...
- Fixed wrong plating around the research break area.
- Navi beacons added to the central hallway, Beepsky sold separately.
- Newer smaller bar added, second spawn for bartender added. Button to lock the doors to and from the bar added to the security checkpoint.
- Garden Camera added for seeing the center of the park.
- Mule drop off point in medical added.
- Scrubbers and vents added to the CE's Office.
- Disposals on the research outpost linked to the outlet.
- Minor layout change in the warden's office.
- 2x more sunglasses added to maintenance.
- 2x more Welding goggles added to engineering, seriously I'm not adding anymore.
- Added a extra mop and bucket to the janitor's closet.
- Space heaters now available in hard storage for engineering.
- Fixed black tiles on Tcomms.
- All existing deck of cards on the main z-level should properly be a deck of cards and not null.
2016-02-20 21:26:37 -08:00
Zuhayr
548965dbd9
Fixes halloss and oxyloss for species with low health values.
2016-02-21 15:43:57 +10:30
Andrew
e86ed849a9
Update glasses.dm
2016-02-20 21:37:40 -06:00
Andrew
38f14c5602
Update autolathe_datums.dm
2016-02-20 21:34:21 -06:00
Yoshax
76db1f5e6c
Changes predefined space cash stacks to be bundles
...
Fixes #926
2016-02-21 02:16:14 +00:00
Mark9013100
8b84695598
Z1/2 Fixes & Edits
2016-02-20 17:55:05 -05:00
Yoshax
2e504f7a90
Changes operator.
2016-02-20 22:49:49 +00:00
Yoshax
dfb8547803
Fixes #1034
2016-02-20 22:16:03 +00:00
Yoshax
8dea347071
Corrects typo
2016-02-20 22:00:16 +00:00
Yoshax
23c3c58f25
Removes inappropriate message
2016-02-20 21:31:13 +00:00
Crazylemon64
6e261771db
Allows lighting of smokeables on burning people
2016-02-20 20:54:27 +00:00
Neerti
bf005fa135
Merge pull request #1028 from Telvayne/patch-3
...
Unlimited Welder Fix
2016-02-20 15:25:35 -05:00
Yoshax
6475c2bab4
Cleans up and modifies code
2016-02-20 20:22:56 +00:00
Yoshax
4480271b5b
Allows pAIs to have their access modified or removed
2016-02-20 18:52:25 +00:00
Yoshax
075b7e0184
Fixes #995
2016-02-20 17:40:08 +00:00
Yoshax
d8c9114d10
Fixes #1007 and adds other missing colored jumpsuits
2016-02-20 12:52:34 +00:00
Kelenius
bcc5127a69
Sprites for drying racks, bees for hydroponics
...
Adds distinct sprites for drying racks, taken from /tg/.
Remaps hydroponics a bit and adds a crate with beekeeping necessities.
Fixes a typo in the smoker.
http://imgur.com/eaDmbPE
http://imgur.com/wywJ9j3
2016-02-20 14:34:54 +03:00
Matt
c07dfe5372
Unlimited Welder Fix
...
Fixes a bug where welders are infinite use. With this, the Welder will not turn on unless it has at least 1u of welder fuel. Previously, it worked on 'not zero', which allowed it to weld endlessly with fractions of 1u inside (as it was not Zero, but could not deduct 1 from it when used).
2016-02-20 06:33:45 -05:00
