EmperorJon
11ddfae6eb
Merge pull request #1185 from Datraen/HarmBatonHallos
...
Harmbatons no longer cause hallos while not on.
2016-03-14 22:41:55 +00:00
Datraen
370d58f54a
Harmbatons no longer cause hallos while not on.
2016-03-14 17:31:58 -04:00
Neerti
3fcc89f666
Merge pull request #1182 from Kelenius/plzNoSpam
...
Cuts down shard spam
2016-03-14 08:41:20 -04:00
Neerti
ccb6f5bd60
Merge pull request #1132 from Hubblenaut/laundry
...
Laundry Basket
2016-03-14 08:40:43 -04:00
Kelenius
25e7dbb86f
Cuts down shard spam
2016-03-14 14:46:43 +03:00
Kelenius
79e850f4d7
Fixes chemical explosions
2016-03-14 12:21:35 +03:00
Mark9013100
905bda9b2d
Removes the need for slides in forensics
2016-03-11 03:53:12 -05:00
Neerti
d412c0a070
Merge pull request #1134 from Kelenius/moreDrills
...
Constructible drills
2016-03-09 20:52:58 -05:00
Hubblenaut
51a6241fdd
Merge remote-tracking branch 'upstream/master' into laundry
2016-03-09 15:56:16 +01:00
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Hubblenaut
f122902b84
Adds laundry basket
...
Conflicts:
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Neerti
2420ed3867
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor
2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Neerti
e9957302ea
Fixes #1103
2016-03-01 01:21:28 -05:00
Hubblenaut
c22f9b2996
Merge remote-tracking branch 'upstream/master' into cash
2016-02-21 17:48:19 +01: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
Hubblenaut
60f5358751
All cash now acts like bundles
2016-02-21 17:23:54 +01:00
sabess
cb1e26ec70
Fixed conflicts with another thing.
2016-02-21 22:48:56 +11: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
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
Yoshax
76db1f5e6c
Changes predefined space cash stacks to be bundles
...
Fixes #926
2016-02-21 02:16:14 +00:00
Yoshax
23c3c58f25
Removes inappropriate message
2016-02-20 21:31:13 +00:00
Crazylemon64 and Yoshax
6e261771db
Allows lighting of smokeables on burning people
2016-02-20 20:54:27 +00: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
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Datraen
129965b1c4
Adds a variable to check for grenade loading, makes frags unloadable.
2016-02-16 12:58:17 -05:00
Neerti
b7a3a98ef0
Ling nerfs, ear protection cleanup, and ling bugfixes.
2016-02-14 19:58:57 -05:00
Mark9013100
cab884b5dc
Implements sprites for shotgun shell boxes.
2016-02-12 20:30:43 -05:00
Mark9013100
63db2c8f0b
Portable Freezers can no longer be folded
2016-02-10 05:43:09 -05:00
Kelenius
f106b3f26b
Removes cloaking device
...
Adminspawn-only device that is never used, but every time a human
updates icons, they check if they have one. Neat!
2016-02-08 14:28:54 +03:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16
Merge pull request #810 from Zuhayr/bayupdate
...
Bay update.
2016-02-05 23:21:07 -05:00
Mark9013100
4782794909
Increases the list of items belts can hold
2016-02-05 23:13:40 -05:00
EmperorJon
c29c97dcce
Merge pull request #905 from Zuhayr/resomi
...
Seromi rename.
2016-02-06 02:24:45 +00:00
Zuhayr
19014807fd
Surface rename of Seromi to Teshari.
2016-02-06 12:50:16 +10:30
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
Zuhayr
43176f6640
Merge pull request #867 from Kelenius/grenadeFix
...
Fixes #847
2016-01-28 21:28:30 +10:30
Zuhayr
ad64a7941b
Merge pull request #863 from Mark9013100/1/26/2016badgesmedals
...
Adds more security badges/medals
2016-01-28 21:26:56 +10:30
Mark9013100
51a9cef15f
Adds more security badges/medals
2016-01-28 00:33:49 -05:00
Kelenius
7ad3cea9ad
Fixes #847
2016-01-27 12:07:35 +03:00
Kelenius
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6
Renaming Resomi to Seromi.
2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486
Revert "Removes Resomi."
...
This reverts commit c9f579e00a
2016-01-27 13:48:48 +10:30
Zuhayr
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
Kearel and Yoshax
5727971690
Semi ports Baystation12/Baystation12#11445
2016-01-25 20:35:52 +00:00
Zuhayr
ab9574ee06
Fixing some infinite loops in gun update_icon() calls.
2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-22 01:33:09 +10:30
EmperorJon