Commit Graph

1022 Commits

Author SHA1 Message Date
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Mark9013100
a8d90003ca Ports /tg/'s warden locker sprite 2016-03-15 06:49:25 -04:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Neerti
ccb6f5bd60 Merge pull request #1132 from Hubblenaut/laundry
Laundry Basket
2016-03-14 08:40:43 -04:00
Yoshax
d64bfb3235 Actually fixes the underwear wardrobe 2016-03-12 02:22:34 +00:00
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Datraen
addbfe11d5 Merge pull request #1153 from Hubblenaut/windowverbs
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut
c7c5e22717 verb shows on playermade windows 2016-03-10 17:06:09 +01:00
Hubblenaut
51a6241fdd Merge remote-tracking branch 'upstream/master' into laundry 2016-03-09 15:56:16 +01:00
Neerti
7b9f011d10 Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Mark9013100
bba0d7e786 Adds departmental bags to wardrobes 2016-03-08 16:37:30 -05: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
Hubblenaut
49d7f0ee3b Window verbs update, wrench noise on dismantling 2016-03-07 19:12:59 +01:00
Neerti
b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Kelenius
b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Hubblenaut
c22f9b2996 Merge remote-tracking branch 'upstream/master' into cash 2016-02-21 17:48:19 +01: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
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
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
ebd2360f43 Merge pull request #1004 from Kelenius/master
Monkey cubes now expand in showers
2016-02-21 17:49:46 +10:30
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
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Kelenius
a5e4aa33d5 Monkey cubes now expand in showers
Port of https://github.com/Baystation12/Baystation12/pull/12107 and
https://github.com/Baystation12/Baystation12/pull/12183
2016-02-18 12:24:38 +03:00
Mark9013100
7d3b5a09b7 Adds the IA jacket/fake sunglasses to custom loadout 2016-02-10 14:16:50 -05:00
Zuhayr
dad8d16136 Allowed pouring reagent containers down the sink. 2016-02-07 21:49:23 +10:30
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
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Mark9013100
3853f34941 Makes the new security badges holobadges 2016-02-03 16:37:19 -05:00
Kelenius
cf244e07d6 Mulebots are now mobs
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Mark9013100
51a9cef15f Adds more security badges/medals 2016-01-28 00:33:49 -05:00
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Mark9013100
21778fc92e Adds portable freezers to med lockers 2016-01-12 19:23:25 -05:00
Zuhayr
0c2ec6422a Merge pull request #727 from Mark9013100/1/3/2016edits
Edits/Changes, 1/3/2016
2016-01-12 04:31:38 +10:30
Zuhayr
baf1e4315e Generalized pulling restrictions to mob level. 2016-01-08 23:20:30 +10:30
Hubblenaut
61e31ab8ad Wheelchair fixes 2016-01-05 00:56:57 +01:00
Mark9013100
91f191e800 Edits/Changes, 1/3/2016 2016-01-03 20:21:34 -05:00
Yoshax
e2388e06d9 Updates terminology 2015-12-31 01:00:05 +00:00
Yoshax
9da04751ef Removes actually seen mentions of the word retard 2015-12-30 19:52:57 +00:00
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30