cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,812 Commits 8 Branches 0 Tags
ece43a1342a19e5a242a422ab876ed40f20e7735
Commit Graph

23684 Commits

Author SHA1 Message Date
killer653
ece43a1342 Update station_vr.dm 2016-07-08 14:05:55 -04:00
killer653
5c9d30103c Update station_vr.dm 2016-07-08 13:55:58 -04:00
killer653
23d833b399 Update human_species_vr.dm 2016-07-08 13:49:53 -04:00
killer653
0b3d6ae838 Update sprite_accessories_vr.dm 2016-07-08 13:48:46 -04:00
killer653
4deb93f1a1 Update station_vr.dm 2016-07-08 13:37:31 -04:00
killer653
76d549a2ed Update station_vr.dm 2016-07-08 13:36:39 -04:00
killer653
62ca476c7d Update station_vr.dm 2016-07-08 13:34:53 -04:00
killer653
3af5c2ffa7 Update void_vr.dm 2016-07-08 13:33:39 -04:00
killer653
a7ef3ae241 Update rig_pieces_vr.dm 2016-07-08 13:33:19 -04:00
killer653
b1920cc5d0 I have to do this by hand since github client is bad. 2016-07-08 13:32:24 -04:00
killer653
1acb7b8094 Update 2016-07-05 23:09:47 -04:00
killer653
1bdbb1af62 Gives xenochimera hair, and also taj hairs. 2016-07-05 23:07:18 -04:00
Cameron653
ae25cc1db9 Makes whitelist not be stupid for the moment 2016-07-05 13:28:16 -04:00
Cameron653
f0a2f5e13e Unwhitelist promethean 2016-07-05 13:10:07 -04:00
Cameron653
972077ee37 Emergency bugfix 2016-07-05 13:08:31 -04:00
Spades
fc059ab4e8 Merge pull request #397 from Cameron653/master 
Egg TF revamp, adds xeno egg sprite, bug fixes, reverts #382
 2016-07-03 20:10:34 -04:00
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync 
Polaris Sync
 2016-07-03 19:47:47 -04:00
killer653
e55d5c6900 AHHHHHHHHHHHHH 2016-07-03 19:05:55 -04:00
killer653
88acd48f16 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
 2016-07-03 19:04:53 -04:00
killer653
4822804911 Fixes conflicts 2016-07-03 19:00:55 -04:00
Spades
27e6a36836 Merge pull request #395 from JoanRisu/Fluff_Items_worshop 
More banners for related universe events
 2016-07-03 18:54:49 -04:00
Spades
bb8c14c69c Merge pull request #390 from VOREStation/meta-human 
Add human recoloring
 2016-07-03 18:54:39 -04:00
Arokha Sieyes
52b0bd25c4 Set respawn back to 60s 2016-07-03 18:15:15 -04:00
Arokha Sieyes
ec07dbbb7d Compatibility tweaks for new Polaris sync 2016-07-03 17:21:03 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
Anewbe
f375595d30 #MoreDice2016 (#2016) 
* Adds more dice

* Adds sprites, fixes some pathing
 2016-07-03 19:48:28 +01:00
killer653
43a7f8bad2 Fixes the sprites not updating after TF 2016-07-03 00:08:58 -04:00
killer653
3d35b13653 Brings back the floorlength braid. 2016-07-02 22:27:10 -04:00
Cameron653
13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Spades
33c36365f6 Merge pull request #393 from Cameron653/master 
Gives monkeys default language, removes neatness tabs.
 2016-07-02 11:38:14 -04:00
Spades
e7e880a3f4 Merge pull request #387 from VOREStation/deathclaw 
Added Deathclaws.
 2016-07-02 11:37:56 -04:00
Cameron653
99a887f1db Gives monkeys the default language 
Also removes the tab spaces that were meant to make it look neater that
Github just said "no" to.
 2016-07-01 14:27:32 -04:00
Yoshax
54594de2db Merge pull request #2019 from Datraen/chemmasterbottleprintfix 
Fixes chem masters not filling bottles when sprite is never changed.
 2016-07-01 18:48:05 +01:00
Yoshax
2a9d1e68bd Readds hub password (#2018) 2016-07-01 13:10:32 -04:00
Datraen
684fb4e23d Fixes runtimes resulting in chem masters not filling bottles when sprite is never changed. 2016-07-01 12:51:10 -04:00
Datraen
19a2656d80 New Cooking Machines Update 2 (#2017) 
* Fixes reagents not transferring again.

* Allows for cooking of non-robotic limbs.
 2016-07-01 16:43:43 +01:00
JoanRisu
fe3c54d7c5 xcom fluff 1 2016-07-01 05:07:00 -07:00
Patch
f054f72ac4 More Teshari icons (#2010) 
* Add Teshari webbing icons from Bay

* Fix teshari suit/head items defaulting to old spacesuit icons

* Add in teshari sized armor icons from Bay
 2016-07-01 04:08:05 +01:00
Yoshax
d2b229cb79 Merge pull request #2003 from Datraen/ApolloCookingPort 
Port of Bay's Port of Apollo's Port of tgstation's Cooking System
 2016-06-30 23:04:31 +01:00
Spades
45ef475bbd Merge pull request #385 from Cameron653/master 
Bugfixes and features
 2016-06-30 10:56:46 -04:00
Spades
821493fcdf Updated to include monkeys and corrections 
Now requires #385 before merging.
 2016-06-30 10:55:57 -04:00
Cameron653
002e768c79 Fixes combat robots not getting their modules. 2016-06-30 09:47:38 -04:00
Mechoid
d1eb23ee8b Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type. (#2008) 
* Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type.

* Fixes an Oops made with Status. (Thanks Zuh)
 2016-06-30 09:03:53 -04:00
JoanRisu
564d3a1ce6 The case of the backwards helmet. 2016-06-29 23:42:17 -07:00
killer653
7575cfef9e Adds the monkeys back 2016-06-30 02:14:36 -04:00
redstryker
be3d6608e7 Adds Evening Gloves (#2002) 
* Adds Evening Gloves

* makes evening gloves a subtype of gloves

* makes evening gloves a subtype of gloves

* updates path in loadout

* updates loadout path
 2016-06-30 00:41:54 -04:00
Yoshax
e9b56deb40 Fixes a bug with tiny peeps 2016-06-30 02:55:18 +01:00
Spades
ea3f9c9aa2 Add human recoloring and clean up code 2016-06-29 20:37:02 -04:00
Yoshax
4451081f37 Ensures post-start antag selection does not select banned people or ghosts or anything else it isn't meant to 2016-06-29 23:58:07 +01:00
Datraen
40e1c11ee6 Fixes #1915 
Psi gave a solution (this one) to the issue on the issue itself.
 2016-06-29 18:24:30 -04:00