cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,782 Commits 7 Branches 0 Tags
59f6b7570a2c898c689dbbc38e0fcd671c83742c
Commit Graph

14634 Commits

Author SHA1 Message Date
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync 
Polaris Sync
 2016-07-03 19:47:47 -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
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
Datraen
684fb4e23d Fixes runtimes resulting in chem masters not filling bottles when sprite is never changed. 2016-07-01 12:51:10 -04: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
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
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
Spades
0c00bd5c59 Added Deathclaws. 2016-06-28 23:30:27 -04:00
Datraen
8f32cc79f4 Merge pull request #1987 from Yoshax/ubersnowflake 
Increases max record and book length to higher levels
 2016-06-27 17:45:30 -04:00
Datraen
c7693e0eab Corrects ChemMaster Bottle Sprites. 2016-06-27 14:28:29 -04:00
Yoshax
38200a3e20 Introduces max record length for record, converts uses of max book length to max paper length barring books 2016-06-27 16:26:31 +01:00
Neerti
6c071290c8 Merge pull request #1983 from Anewbe/ninja_cloak+dart 
Fixes some Ninja stuff
 2016-06-27 01:25:47 -04:00
Neerti
78d097d1cc Merge pull request #1990 from Anewbe/cloak_test 
Attacks break stealth
 2016-06-27 01:25:19 -04:00
Anewbe
72a5e8316f Attacks break stealth 2016-06-26 23:31:01 -05:00
Datraen
c391a58ab2 Merge pull request #1909 from Yoshax/heavyguns 
Heavy weapons changes
 2016-06-27 00:09:18 -04:00
Neerti
6374bc2c4c Merge pull request #1982 from Anewbe/ninja_examine 
Ominous Suit Module flavor text
 2016-06-26 19:36:42 -04:00
Anewbe
17e211e200 Fixes some Ninja stuff 2016-06-26 18:20:35 -05:00
Anewbe
f6fe845a8a Removes the Spider Clan reference 2016-06-26 18:10:28 -05:00
Anewbe
895740368a Drones no longer boom on z-level change 2016-06-26 15:22:50 -05:00
killer653
da250037d2 Ctrl C, Ctrl V doesn't always work 2016-06-25 23:02:52 -04:00
killer653
9bbcf5c8c6 Whoops! 2016-06-25 22:58:00 -04:00
killer653
6fd78fe69b This took 5 hours to fix 
...due to user error. It was a 5 minute fix that required 1 new line of
code.

Coding hurts.
 2016-06-25 22:31:58 -04:00
EmperorJon
3f71640610 Merge pull request #1973 from Neerti/6/24/2016_make_buildmode_great_again 
Makes Buildmode Great Again
 2016-06-25 05:04:30 +01:00
Neerti
4f7641b1b8 Adds the following; 
Control-click to copy object type to adv. buildmode
Ability to instantly build a rectanglar room with custom walls and floor by clicking two points.
Ability to create two ladders, linked to each other, and have correct icons, by clicking two points.
Ability to instantly move one object into another object by left/right clicking.
Ability to make anything glow, with custom range, intensity, or color, or to reset glowing.
Partial pathnames for all buildmode path inputs.
Adds spans.
 2016-06-24 23:16:33 -04:00
Spades
e56fc38403 Merge pull request #376 from viv-eret/master 
Adds tentacle taur sprites
 2016-06-24 18:49:40 -04:00
Yoshax
53d67ee8af Ports Snowy stuff from Eros 2016-06-24 14:35:17 +01:00
EmperorJon
a1cfdb6ee6 Merge pull request #1963 from SinTwo/NanoUI 
NanoUIfication
 2016-06-23 22:33:05 +01:00