cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 7 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

2174 Commits

Author SHA1 Message Date
Neerti
6126cf5eaf Merge pull request #3218 from Anewbe/automute 
Automute shouldn't go off if you didn't type anything
 2017-04-03 18:35:02 -04:00
Anewbe
acf10ccfe9 Adds Chief of Security alt title for HoS 2017-04-03 15:14:25 -05:00
Anewbe
1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe
b38986b4b7 Merge pull request #3209 from Atermonera/master 
FBPs can have numbers in their names.
 2017-04-03 13:56:06 -05:00
Arokha Sieyes
c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?
 2017-04-02 23:25:59 -04:00
Anewbe
cb877ab09a Robolimbs last longer without negative effects 2017-04-02 19:35:31 -05:00
Anewbe
21f2bfc12d Towels dry 2017-04-02 17:34:52 -05:00
Atermonera
67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Anewbe
1428faa773 Changelog 2017-04-02 11:15:34 -05:00
Anewbe
1bc8b9d716 Merge pull request #3200 from Atermonera/Translator_Languages 
Translators and animal languages
 2017-04-02 11:04:22 -05:00
Atermonera
85c78001cb Several simple_animals have their own languages, with custom syllables. 2017-04-01 16:46:28 -07:00
Leshana
9f6047f944 Mapped in jumper cables and generated changelog 2017-04-01 19:26:57 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
 2017-04-01 19:19:42 -04:00
Neerti
89088cdbda Merge pull request #3199 from Anewbe/flower_crowns 
Wooden circlets can now be worn as hats
 2017-04-01 17:47:09 -04:00
Anewbe
1ea5252f5d Merge pull request #3181 from VOREStation/vplk-pipelayer 
Modernize the automatic pipe layer
 2017-04-01 15:59:05 -05:00
Anewbe
27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -05:00
Leshana
9b4eaf3e1d Added changelog yml 2017-04-01 14:22:28 -04:00
Anewbe
acee0a225f Merge pull request #3195 from MagmaRam/splints 
Splints
 2017-04-01 12:00:32 -05:00
MagmaRam
44e9df06e8 Forgot the changelog 2017-03-31 23:25:19 -05:00
MagmaRam
cfa57e9a90 Changelog update 2017-03-31 20:12:25 -05:00
MagmaRam
4000be7ec5 Merge pull request #3191 from Anewbe/flashlight_options 
Adds a few more cosmetic flashlights
 2017-03-31 20:07:42 -05:00
MagmaRam
4bb94a5506 Merge pull request #3187 from Anewbe/cargo_things 
Adds a bunch of things to cargo
 2017-03-31 19:39:24 -05:00
Anewbe
ca47d37d2f Adds a few more cosmetic flashlights 2017-03-31 18:50:00 -05:00
Anewbe
b515f451d4 Maps in some jumper cables 2017-03-31 00:57:03 -05:00
Anewbe
72adee8fb8 Adds a bunch of things to cargo 2017-03-31 00:23:27 -05:00
MagmaRam
739cb17103 changelog update 2017-03-30 21:01:42 -05:00
Anewbe
cf9e3f8789 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo 2017-03-30 20:51:13 -05:00
MagmaRam
34e398d328 Merge pull request #3175 from Anewbe/hands_things 
Device Cell QOL
 2017-03-30 20:49:24 -05:00
Anewbe
88a5cbda7a Adds a changelog for the body marking PR 2017-03-30 20:18:06 -05:00
Anewbe
53388aced3 Merge pull request #3182 from MagmaRam/changelog 
Changelog update
 2017-03-30 20:14:47 -05:00
Anewbe
f7d086fa59 Overdose is more dangerous, Bicaridine works again 2017-03-30 20:09:21 -05:00
Anewbe
c18223dcb4 Changelog 2017-03-30 19:54:45 -05:00
MagmaRam
f7ea017bc2 Changelog update 2017-03-30 19:41:14 -05:00
Anewbe
6328f1262f Adds in Jumper Cables for FBP reviving 2017-03-29 12:43:38 -05:00
Anewbe
f284970358 Adds craftable whetstones, changelog 2017-03-28 23:50:21 -05:00
MagmaRam
d98745d9d3 Merge pull request #3169 from Anewbe/italics_switch 
Italics switch from / to | characters
 2017-03-28 21:54:23 -05:00
Anewbe
b34aefb814 Merge pull request #3168 from MagmaRam/robit_grinders 
Robots, cyborgs, etc can now use grinders in the kitchen and chemlab
 2017-03-28 21:26:46 -05:00
Anewbe
cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -05:00
MagmaRam
a3c83ac025 Robots, cyborgs, etc can now use grinders in the kitchen and chemlab 2017-03-28 20:47:38 -05:00
MagmaRam
5c25a088f1 Changelog update 2017-03-28 20:12:20 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage 
Big Ol' Medical Tweaks
 2017-03-28 20:02:24 -05:00
Anewbe
b1620cfa20 Borgs can climb 2017-03-27 23:15:13 -05:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Neerti
eb73ee4b44 Merge pull request #3120 from Anewbe/alien_tweaks 
Xeno race tweaks
 2017-03-25 11:27:22 -04:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
MagmaRam
daa93cdc50 Name fix 2017-03-24 12:15:29 -05:00
MagmaRam
2867b63c04 Updates changelog 2017-03-22 19:10:56 -05:00
Leshana
f93141d7d3 Merge remote-tracking branch 'polaris/master' 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme
 2017-03-22 20:08:29 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
 2017-03-22 17:29:01 -05:00
Anewbe
68a335b0c5 Xeno race tweaks 2017-03-21 23:31:10 -05:00