cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,406 Commits 7 Branches 0 Tags
c13f73848cf4f1f4aed0140f206eb0e169fbbf34
Commit Graph

20323 Commits

Author SHA1 Message Date
Repede
c13f73848c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	vorestation.dme
 2018-02-28 22:06:46 -05:00
Repede
8a455664a1 Yes again 2018-02-28 21:50:43 -05:00
Aronai Sieyes
e982225d1a Merge pull request #3163 from VOREStation/aro-destroy-medical-forever-because-obviously-i-hate-medical-duh 
... but not borg syringes.
 2018-02-28 21:09:13 -05:00
Aronai Sieyes
48b8c6f5fb Merge pull request #3158 from VOREStation/aro-runtime 
Fix a runtime with snacks
 2018-02-28 20:55:09 -05:00
Arokha Sieyes
489634a204 ... but not borg syringes. 2018-02-28 20:53:07 -05:00
Repede
9420c7a4a3 yes 2018-02-28 20:26:17 -05:00
Arokha Sieyes
3004093a50 Make syringe reuse a bad idea 
Because now it can infect limbs and transfer viruses
 2018-02-28 20:03:18 -05:00
Repede
93573abcf9 More TGS3 Discord Bot Tests 2018-02-28 19:33:28 -05:00
Repede
7478ae0cb6 Adding more functionalities to Discord Bot (Mainly testing) 2018-02-28 19:12:23 -05:00
Repede
22fb793bce Adding test 'who' command to discord bot 2018-02-28 18:25:29 -05:00
Arokha Sieyes
5d54787198 Fix a runtime with snacks 2018-02-28 15:57:07 -05:00
Aronai Sieyes
f9427ec4a5 Merge pull request #3143 from Cyantime/patch-4 
Adds onions to the seed vender
 2018-02-27 21:50:48 -05:00
Aronai Sieyes
3ef3275d59 Merge pull request #3139 from VOREStation/Cameron653-patch-2 
Promethean Water Edits
 2018-02-27 21:50:38 -05:00
Aronai Sieyes
2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Aronai Sieyes
dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo 
Adds 'Intercom Convo' verb
 2018-02-27 21:48:39 -05:00
Aronai Sieyes
0f4185ceec Merge branch 'master' into aro-bellies 2018-02-27 21:39:53 -05:00
Aronai Sieyes
d0fbc58100 Merge pull request #3145 from VOREStation/aro-nifexamine 
Readds NIF examine text
 2018-02-27 21:38:25 -05:00
Aronai Sieyes
91c08edf70 Merge pull request #3133 from VOREStation/exp-turfs-overlays 
Convert turfs to use add_overlays()
 2018-02-27 21:31:35 -05:00
Arokha Sieyes
0c4cc6811a VS: Convert some VS things to use global_announcer 2018-02-27 21:30:06 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
Arokha Sieyes
43065846a4 Adds 'Intercom Convo' verb 
Allows an admin to 'schedule' up to 20 messages to play on the radio.
 2018-02-27 21:24:22 -05:00
Arokha Sieyes
66f2acb931 Handle NIF examine saving string vs null 2018-02-27 19:22:31 -05:00
Aronai Sieyes
1fd65b1854 Merge pull request #3138 from VOREStation/Cameron653-patch-1 
Gives prometheans the trash eater trait.
 2018-02-27 18:57:47 -05:00
Repede
a4202ec1d6 Implemented basic GLOB and TGS3's DMAPI 2018-02-27 18:31:13 -05:00
Cameron653
c34cf7000e Gives them the trash eater command 2018-02-27 17:34:05 -05:00
Aronai Sieyes
dcb29aec67 Merge pull request #3140 from Heroman3003/handytry 
New Handy sprites for non-dog borg modules
 2018-02-27 14:07:32 -05:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00
Arokha Sieyes
f24971af4e POLARIS: Hide things from lists in VV 
Like organs from contents. You can look at the organs and internal_organs list on the same page... don't clutter contents.
 2018-02-27 13:29:40 -05:00
Arokha Sieyes
f87fcd37f1 POLARIS: Port's /tg/'s current sound.dm, plus pref 
It's mostly the same, just a little more efficient. I added a 'preferences' var to pass a datum and decide whether or not to play the sound for that client based on some preference.
 2018-02-27 13:29:39 -05:00
elgeonmb
8c9c99f817 Adds new languages (#4961) 
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
 2018-02-26 21:21:50 -06:00
Arokha Sieyes
c4af5850d1 Readds NIF examine text 
Recoded it a little different. The verb is in OOC, if you have a NIF. It's saved as part of the NIF, so if your head explodes and you lose your NIF, you'll need to describe your new one.

Also fixes an unrelated bug where ghosts examining people print all sorts of crazy messages about being able to trample people.
 2018-02-26 20:27:13 -05:00
Repede
d6889dbdcf Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-02-26 19:36:57 -05:00
Heroman3003
55121258bc Fixed some funky code. 2018-02-27 07:59:33 +10:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater 
Makes drinking bleach bad for you
 2018-02-26 12:16:13 -08:00
Atermonera
eaaec93df2 Merge pull request #4955 from Anewbe/prommie_water_fix 
Fixes a bug in Promethean water ingestion
 2018-02-26 12:15:51 -08:00
Atermonera
56b54aba73 Merge pull request #4948 from Nerezza/Tilematic 
Adds TG-style floor tile swapping
 2018-02-26 12:12:26 -08:00
Cyantime
208092e068 Adds onions to the seed vender 2018-02-26 18:57:32 +00:00
Leshana
7483ede4d2 Merge pull request #3127 from Cyantime/patch-2 
Fixes vasilissan flags
 2018-02-26 02:35:13 -05:00
Heroman3003
d077d0239c Added mining, security and standard Handies (for full set) 2018-02-26 14:33:12 +10:00
Heroman3003
5dd6e79421 fixed blinking of new sprites properly 2018-02-26 11:26:11 +10:00
Heroman3003
22103c05e4 fixed blinking of new sprites 2018-02-26 11:20:32 +10:00
Heroman3003
6407ded832 dog sprites won't disappear now 2018-02-26 08:28:14 +10:00
Cameron653
756f42ffd5 Whoops, messed up comment formatting 2018-02-25 17:01:49 -05:00
Cameron653
cc7b722443 Update Chemistry-Reagents-Core.dm 2018-02-25 16:54:17 -05:00
Kelshark
57148a5718 Fixed Chemistry-Holder.dm not being the same as upstream for strange reasons. 2018-02-25 16:04:58 -05:00
Heroman3003
970dc7fd3c Added new Handy sprites and possibility for new ones 2018-02-26 05:25:23 +10:00
Neerti
355aaec3d2 Merge pull request #4950 from Anewbe/yet_another_fix 
Should be able to attach accessories by clicking the target item again
 2018-02-25 14:11:43 -05:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Anewbe
5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes 
Flooring fixes
 2018-02-25 12:39:33 -06:00
Anewbe
a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak 
Tweak weird MA override
 2018-02-25 12:38:58 -06:00