Commit Graph

376 Commits

Author SHA1 Message Date
Yoshax
288be19de4 Changes some antag items to not have 'suspicious' in their name 2016-03-25 19:28:49 +00:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Neerti
ccb6f5bd60 Merge pull request #1132 from Hubblenaut/laundry
Laundry Basket
2016-03-14 08:40:43 -04:00
Mark9013100
905bda9b2d Removes the need for slides in forensics 2016-03-11 03:53:12 -05:00
Hubblenaut
51a6241fdd Merge remote-tracking branch 'upstream/master' into laundry 2016-03-09 15:56:16 +01: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
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
Yoshax
76db1f5e6c Changes predefined space cash stacks to be bundles
Fixes #926
2016-02-21 02:16:14 +00:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
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
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
Zuhayr
19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +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
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
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check.
Fixes #11900.
2016-01-06 18:31:39 +01:00
PsiOmegaDelta
2e89b7c718 Fixes the canUnEquip() proc.
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30
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
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
Neerti
ab66a273e0 Merge pull request #541 from Mark9013100/12/11/2015detbeltandsecedits
Adds a detective belt and other edits for security
2015-12-12 23:21:52 -05:00
woodratt
a22195aed3 1.3.0 of Grenades and Elevators
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
2015-12-11 23:05:15 -08:00
Mark9013100
09b9be4b72 Adds a detective belt and other edits for security 2015-12-11 22:43:13 -05:00
Zuhayr
000438aa94 Allowed lighters to be put into cigarette packets. 2015-12-11 15:55:15 +10:30
woodratt
be97cbaf48 1.2.7 Map Fixes and sprite additions
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
2015-12-10 10:35:38 -08:00
woodratt
21b6a4a102 Woodrat 1.2.5 Bed DLC
- Fixed scrubber line on the Engineering outpost
- Dropped max storage space on the dufflebag from 56 to 38
- Changed bed and bedsheet sprites.
- Removed bedsheet from the psych couch.
2015-12-07 19:18:04 -08:00
Earthcrusher
61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00
PsiOmegaDelta
11e47bc8c2 Fixes being unable to emag secure closets.
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
2015-12-02 08:30:47 +01:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry
Adds laundry basket
2015-10-31 11:16:14 +01:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b Surgical kits can now contain their equipment.
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
2015-10-15 10:20:49 +02:00