cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,782 Commits 5 Branches 0 Tags
59f6b7570a2c898c689dbbc38e0fcd671c83742c
Commit Graph

31782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync 
Polaris Sync
 2016-07-03 19:47:47 -04:00
Leshana
4626c072a3 Adding in the library so we can use mariadb alright? 2016-07-03 19:40:16 -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
75aeb381e9 Map changes for sync 
Updates cooking machines
Adds status displays in docking area
 2016-07-03 17:59:09 -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
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
Yoshax
1ddc30a0ec Updates changelog (#2021) 2016-07-01 16:33:00 -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
Cameron653
daffbb284a Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-07-01 14:22:08 -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
Spades
c510cfaed2 Merge pull request #392 from JoanRisu/Fluff_Items_worshop 
The case of the backwards helmet.
 2016-06-30 10:47:18 -04:00
Yoshax
f49c50cf9b Merge pull request #2009 from Cameron653/master 
Two robot related bugfixes
 2016-06-30 15:39:32 +01:00
killer653
60d937c2cf Fixes a bug that would cause the engineering module icon 
to not show up
 2016-06-30 10:23:12 -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
Datraen
77a3132371 Merge pull request #2006 from Yoshax/hotpatootieblessmysoul 
Adjusts post-start antag selection
 2016-06-30 00:41:31 -04:00
Spades
1dd6befbce Merge pull request #391 from Yoshax/bugfix 
Fixes #375
 2016-06-29 23:22:26 -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
Neerti
3a8533bc9e Merge pull request #2005 from Datraen/runtimefix 
Fixes a runtime at server start.
 2016-06-29 18:27:07 -04: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
Datraen
606cc7ce15 Updates map. 2016-06-29 16:33:04 -04:00
Datraen
7d0cb20036 Fixes issues with transferring reagents. 2016-06-29 15:41:27 -04:00
Datraen
a10f525638 Adds compatability with cooking code 2016-06-29 15:40:34 -04:00
Zuhayr
764c78b25f Ported and rewrote several cooking machines from Apollo by request. 
# Conflicts:
#	maps/exodus/exodus-1.dmm
 2016-06-29 13:59:24 -04:00
Neerti
0dc029255d Merge pull request #2001 from Datraen/pipecolorfix 
Pipes that can be colored now set pipe_color instead of color
 2016-06-29 12:55:47 -04:00
Datraen
bd0fc87df4 Fixes #1296 2016-06-29 12:31:39 -04:00
EmperorJon
aa1be3edad Merge pull request #2000 from Datraen/FluffyAntags 
Adds fluff antag factions, antag visibility options for uplinks.
 2016-06-29 16:44:07 +01:00
Datraen
ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks. 
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
 2016-06-29 11:25:52 -04:00
killer653
33f94bd9c1 Makes absorb longer 2016-06-29 03:47:20 -04:00
killer653
64b42e6257 Forgot this 2016-06-29 03:11:49 -04:00
killer653
4fbec91352 Fixes absorption 2016-06-29 02:53:09 -04:00
killer653
90b609c291 Fixes #386 2016-06-29 02:40:01 -04:00