cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 19:16:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
1602 Commits
Author SHA1 Message Date
Anewbe 6b0704f10f Adds pepperspray and a crowbar to the HoS locker 2016-07-31 23:05:38 -05:00
YoshaxandGitHub 6945aff868 Merge pull request #2187 from Anewbe/sec_coat_pockets 
Adds pockets to the HoS and Warden coats
 2016-07-25 01:41:45 +01:00
NeertiandGitHub fc762a6e83 Merge pull request #2189 from SinTwo/item_state 
Icon Fix Fun Time
 2016-07-24 19:21:09 -04:00
SinTwo 1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
Anewbe 56f9e63c64 Adds pockets to the HoS and Warden coats 2016-07-24 15:55:54 -05:00
AnewbeandGitHub 612a6f8328 Merge pull request #2149 from SinTwo/item_state 
Item State Cleanup
 2016-07-23 15:53:36 -05:00
NeertiandGitHub 313aff19b7 Merge pull request #2179 from Yoshax/gottagofast 
Ports /vg/ get_turf
 2016-07-23 16:34:31 -04:00
commaandYoshax 2fc033ee0e Ports /vg/ get_turf 
Gotta go faster.
Possibly undocumented behaviour of get_step?
 2016-07-23 18:00:50 +01:00
Yoshax 079ce6a71f Grammar fix + Ensures Christmas drop pod has trees 2016-07-23 15:23:54 +01:00
SinTwo cf45a827a9 final cleanup 2016-07-18 16:03:53 -04:00
SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
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
Cameron653 13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Cameron653andGitHub 947d1f3073 Update egg_vr.dm 2016-06-28 10:20:00 -04:00
Cameron653andGitHub 720b6df5e9 Fixes #384 
Fixes #384
 2016-06-28 10:19:20 -04:00
Cameron653 4543b8c8f9 LOTS O FIXES 2016-06-11 02:30:36 -04:00
Arokha Sieyes eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	vorestation.dme
 2016-06-07 18:37:47 -04:00
PsiOmegaDeltaandYoshax 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
Leshana eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
SpadesandYoshax 26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
EmperorJonandYoshax 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 StylinandYoshax 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
Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink 
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
 2016-05-29 16:22:07 -04:00
EmperorJonandYoshax 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
Leshana d15e300aee Fixes #155 - Allow building lights on windows. 2016-05-24 23:48:03 -04:00
Spades 02ba44aa02 Beach.dmm fixes 
Map is bigger and the forest spawns now.
 2016-05-21 16:32:37 -04:00
Spades 11e9eda4f4 Numerous tweaks and fixes. 
- Fixed the teleporter room being labeled wrong. Now "Long-Range
Teleporter". Resolves #136
- Beach now has clutter. Resolves #141
- Beach now has borders. Resolves #142 but creates a new problem by
making the map too small. I'll fix this later.
 2016-05-21 13:38:49 -04:00
Arokha Sieyes 8230732453 Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync 2016-05-19 23:52:00 -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
Cameron653andArokha Sieyes d199552fa0 Egg transformation. A few bug fixes (#76) 
* This compiles, has a debug in a few areas

But doesn't actually work in game

* This didn't go with the first sync. booo.

* Actually gets egg TF to work. Fixes spacesuit sprites

* Makes the borgs stomach show up

* More  bugfixes!
 2016-05-16 19:16:35 -04:00
Arokha Sieyes d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
Yoshax 49a249af00 Multi-tile airlock building FIX 2016-05-16 18:31:32 +01:00
Arokha Sieyes f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update 
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
 2016-05-15 12:39:30 -04:00
Yoshax 939073a0d2 Adds click cooldown to display case 2016-05-13 01:34:19 +01:00
Arokha Sieyes 8cce41bf84 Adds anti-tamper to crates and adds anti-tamper 1 to abandoned ones. 
Also fixes a minor thing they did to species, renamed a flag.
 2016-05-12 14:14:01 -04: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
YoshaxandDatraen 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