cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 8 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

889 Commits

Author SHA1 Message Date
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2017-12-26 23:07:58 -05:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404) 
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
 2017-12-23 14:45:24 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid 
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
 2017-12-12 19:51:35 -06:00
mistyLuminescence
4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
PrismaticGynoid
fe9d6864c0 Ports ghosts examining locker contents 
A port of https://github.com/Baystation12/Baystation12/pull/19436 . Ghosts clicking on a locker or crate to examine it can now see a list of its contents.
 2017-12-03 15:25:04 -08:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob 
# Conflicts:
#	code/game/atoms_movable.dm
 2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Kelshark
b0d5dba835 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
 2017-11-25 11:49:28 -05:00
Kelshark
33d109b2dd Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-11-25 11:35:10 -05:00
killer653
463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
mistyLuminescence
0431c2d23c Changes the old hyposprays to the new hyposprays. (#4223) 
* Hypospray mk1 -> Hypospray mk2

* Medical random spawns no longer have the new hypo.

* Medic syndiecrate now has the old hypo
 2017-11-15 16:31:50 -06:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Kelshark
8b32b39c6f Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-11-07 08:17:53 -05:00
mistyLuminescence
9dad109f22 Putting wielded fire axes back now works correctly. 2017-11-06 10:27:55 +00:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217) 
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
 2017-11-05 22:53:11 -06:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561 
Plushie tweaks!
 2017-11-01 21:57:56 -05:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Kelshark
92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
 2017-10-29 18:14:56 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
073fd9524c Adjusts outfits again 2017-10-25 02:24:15 -05:00
Kelshark
3ab70b7996 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-10-17 08:49:37 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
mistyLuminescence
f87a6d7d8c Adds a white robe. (#4074) 
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
 2017-10-16 04:27:03 -05:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067) 
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
 2017-10-15 15:04:56 -05:00
MisterLayne
392aa1d8bc Makes the new T-Ray Scanners available 2017-10-11 17:11:49 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Spades
54d4069eff Merge pull request #2195 from Verkister/returnofthelongpup 
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
 2017-10-03 22:31:24 -04:00
Kelshark
9e4136784d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/species/akula/mask_vr.dmi
#	icons/mob/species/fennec/mask_vr.dmi
#	icons/mob/species/fox/mask_vr.dmi
#	icons/mob/species/nevrean/mask_vr.dmi
#	icons/mob/species/vulpkanin/mask.dmi
#	icons/mob/vore/taurs_vr.dmi
 2017-10-03 19:04:51 -04:00
Spades
aa10a65b30 OSHA approved map changes 
- More fire lockers and oxy closets in places.
- All elevator entrances have emergency shutters in front of them, which
can be used as a defacto airlock if needed.
- All fire closets have emergency toolboxes now.
- Other minor map edits.
 2017-10-03 02:49:45 -04:00
Neopatra
2503183c21 Adds Taur hazmat and Rad suits to lockers 
As well as bomb suits.
 2017-10-01 09:30:32 -04:00
Verkister
bc5b5e7b44 Brings back some slightly tweaked individual oties. 
-With the lack of any in-depth borkage documentation, I felt like staying with my earlier point of the big issues being likely caused by vast numbers of these feature heavy snowflake mobs being spawned for wilderness cannonfodder en masse, which the current wildernessless build would rule out for better troubleshooting.
-People had been missing these in IC near my chars in multiple occasions recently and I didn't have the heart to tell em they were gone lmao.
-Only available via cargo orders now.
 2017-09-23 14:24:40 +03:00
Kelshark
c91dbd0057 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2017-09-21 18:37:11 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
Cameron653
79c5018dfa Adds medical tape to paramedic and CMO locker 2017-09-12 14:54:06 -04:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again 
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
 2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Kelshark
5ee893eda1 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme
 2017-09-03 12:49:08 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades
4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00
Spades
229431bd4d Oh sure you compile fine but Travis cries 2017-08-27 01:49:41 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00