cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 6 Branches 0 Tags
2fea474564981b51a73f0cb5efa838fbe5da0e94
Commit Graph

14572 Commits

Author SHA1 Message Date
Yoshax
10bc1bf21e Merge pull request #2040 from redstryker/Mask_Changes 
Adds the Ability to Pull Down Sterile Masks and Wear Bandannas on Head
 2016-07-05 02:19:44 +01:00
Yoshax
27c4ec5c73 Merge pull request #2038 from Woodratt/1.5.3_Trade_Ship 
- Adds Serena's Trade Ship along with all the odds and ends required …
 2016-07-05 02:18:28 +01:00
redstryker
1dcad7f92d Adds the Ability to Pull Down Sterile Masks and Wear Bandanas on the Head 2016-07-04 19:31:15 -04:00
SinTwo
386ceb2bc5 makes water-cooler bottles attainable through in-game means 2016-07-04 18:17:53 -04:00
woodratt
55562aeb3f - Adds Serena's Trade Ship along with all the odds and ends required to have it work properly. 
- Adds a special snowflake mutt as well for ease of teleportation to the trade ship area prep area.
 2016-07-04 14:07:14 -07:00
Anewbe
c145e19177 Gauntlets shouldn't eat gloves 2016-07-04 00:46:25 -05:00
Yoshax
e164f7460a Merge pull request #2034 from aztectornado/teshfix 
Temporarily removes Teshari lonliness as possible bugfix
 2016-07-04 04:05:28 +01:00
Patch
14dc4aef0e Temporarily removes Teshari lonliness as possible bugfix 2016-07-03 21:05:30 -05:00
Anewbe
3f3d89b08e Removes "is" from pose. 2016-07-03 19:22:39 -05:00
Anewbe
f375595d30 #MoreDice2016 (#2016) 
* Adds more dice

* Adds sprites, fixes some pathing
 2016-07-03 19:48:28 +01:00
Anewbe
1d9e7cd95b Fixes 2016-07-02 21:25:38 -05:00
Anewbe
ab9bfb3817 Adds gauntlets, allows RIGs to be worn over gloves 2016-07-02 20:18:19 -05:00
Yoshax
9c62a2583b Ports some cat hair or something 2016-07-02 03:58:20 +01: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
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
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
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
SinTwo
a7aa2a7f33 makes benches a subtype of tables 2016-06-29 17:52:27 -04:00
SinTwo
c7db22b985 water cooler fixes 2016-06-29 16:36:43 -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
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
20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -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
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
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
SinTwo
2642bc1628 changelog and chemmaster fix 2016-06-23 15:01:17 -04:00
Neerti
53d60eb554 Does even more work. 
NOTE: asphyxiation is broken!
 2016-06-23 05:21:04 -04:00
EmperorJon
c056e007cd Merge pull request #1956 from Yoshax/harpiesports 
Various Bay Ports
 2016-06-21 17:31:29 +01:00
SinTwo
244fb40de8 Fixes part 1 2016-06-20 23:32:18 -04:00
SinTwo
32e9c4a34b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoUI 
Conflicts:
	code/game/machinery/adv_med.dm
 2016-06-20 11:51:25 -04:00
SinTwo
1e2136781c Adds NanoUI for multiple computers. 2016-06-20 11:48:52 -04:00
Neerti
c727d57872 Merge pull request #1953 from Anewbe/nt_fbp 
Adds NT brand prosthetics
 2016-06-20 11:43:52 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
SinTwo
da38eca686 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack 2016-06-19 22:28:31 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00