cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 15:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,509 Commits 2 Branches 1 Tag
948d43afecadc272b215ec2e8c46f30a901b5c18
Commit Graph

1626 Commits

Author SHA1 Message Date
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Neerti
e9dd848cf1 Freezer Fixes 
Freezer crates, freezer boxes, cryobags, and medical grippers now properly preserve organs, as well as organs attached to organs.
Cleans up storage.dm slightly by removing loc setting with forceMove(), for the above to work.
 2016-07-10 03:00:25 -04:00
PsiOmegaDelta
457b4cc367 Large crates now insert items on initialization. 
Similar to how crates/lockers do it.
 2016-06-07 19:06:45 +01:00
Broseph Stylin
97a94af41a Fixes mapped-in double beds being made of steel and lacking padding. 2016-06-03 02:36:27 -03:00
Neerti
a95b47174e Merge pull request #1851 from Yoshax/bugfixes 
Adjusts the checks to ensure you cannot buckle two people to the same thing
 2016-06-02 10:36:25 -04:00
Yoshax
4d3afc42b6 Adjusts the checks to ensure you cannot buckle two people to the same thing 2016-06-02 15:04:40 +01:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Yoshax
0fac31fad3 Fixes being able to buckle more than one mob to bucklable things 2016-06-01 16:34:07 +01:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
Broseph Stylin
333603ce51 Adds working double beds. (#1807) 
* Adds double beds.

* Adds double bedsheets + Ian single bedsheet.

* Adds double bedsheet sprites.

* Adds double bed sprites.

* Fixes a stupid item_state mistake.
 2016-05-30 19:03:56 +01:00
EmperorJon
5a545854a4 Underwear Datums (#1794) 
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
 2016-05-29 17:29:36 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Leshana
844ea7febc Allow building lights on windows. 2016-05-25 21:43:59 -04:00
Datraen
2a6e86f4fc Merge pull request #1578 from SinTwo/clothes 
Skirt addition and loadout refactor
 2016-05-19 09:00:41 -04:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -04:00
Yoshax
49a249af00 Multi-tile airlock building FIX 2016-05-16 18:31:32 +01:00
Yoshax
939073a0d2 Adds click cooldown to display case 2016-05-13 01:34:19 +01:00
Neerti
b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf 
Reinforced Walls
 2016-05-11 01:52:46 -04:00
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
 2016-05-06 21:03:18 -04:00
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2016-05-06 18:31:07 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -04:00
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508) 
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
 2016-05-04 17:20:22 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax
5d6e129ebf Adjusts HoS' locker capacity 2016-04-28 21:37:57 +01:00
Datraen
45f97f2a45 Merge pull request #1491 from Hubblenaut/morgue 
Morgue Trays interface with occupant minds
 2016-04-27 20:49:15 -04:00
Hubblenaut
c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound. 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2016-04-22 04:58:25 -04:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels 
Adds EMT Duffelbags
 2016-04-21 21:08:19 -04:00
Nerezza
24cd704115 Adds EMT Duffelbags 
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
 2016-04-21 16:37:43 -05:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port 
Ports Bay's new inventory system.
 2016-04-16 02:58:07 +01:00
Mark9013100
2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
Hubblenaut
e41ad0c946 Reinforced Walls 
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
 2016-04-15 16:41:33 +02:00
Neerti
25c04df5bd Polaris tweaks. 
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
 2016-04-06 07:48:09 -04:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb 
Adds the medical webbing
 2016-04-01 16:53:58 -04:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Mark9013100
1522026190 Detectives now spawn with CSI Kit 2016-03-30 11:50:54 -04:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes 
Map fixes, minor edits
 2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs 
Adds Navy Blue scrubs
 2016-03-30 02:24:07 -04:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Mark9013100
f57eef764f Bedsheets can be worn as capes 2016-03-28 22:01:37 -04:00
Mark9013100
26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Neerti
0844d0b9f0 Merge pull request #1239 from Mark9013100/3/23/2016layering 
Layering fixes for bedsheets/curtains
 2016-03-26 17:06:54 -04:00