cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,423 Commits 8 Branches 0 Tags
a72f7344bb13a1330eedab4558a9473d249736e7
Commit Graph

31396 Commits

Author SHA1 Message Date
Repede
a72f7344bb Added single horn marking 2018-03-04 16:21:02 -05:00
Repede
f41b0b2390 Fookin fidget spinners 
And kitsune tail
 2018-03-04 00:03:44 -05:00
Repede
e3b03832f1 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	vorestation.dme
 2018-03-03 15:14:27 -05:00
Arokha Sieyes
f37e75011b Revert "Reverse floor decal removal commit 00f8ae5" 
This reverts commit 517d4a9e56.
 2018-03-02 20:04:08 -05:00
Arokha Sieyes
8a8c4d76d2 Convert bellies to save using JSON 2018-03-02 02:22:20 -05:00
Repede
c749c27e1a Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-03-01 21:49:58 -05:00
Arokha Sieyes
517d4a9e56 Reverse floor decal removal commit 00f8ae5 2018-03-01 09:43:38 -05:00
Repede
40130ec532 If you read this you are triple gay 2018-02-28 23:31:36 -05:00
Leshana
94d026e2b1 Merge pull request #3164 from Heroman3003/handytry 
Fix for disappearing dogborgs
 2018-02-28 23:14:58 -05:00
Repede
fcdbc904bb reeeee 2018-02-28 23:14:06 -05:00
Repede
047ed8c0a6 woo 2018-02-28 22:55:59 -05:00
Repede
d0a54ae997 unfucked a file 2018-02-28 22:16:24 -05:00
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
Heroman3003
20bc8130f5 brokenwideborgs fix 2018-03-01 12:47:27 +10: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
Aronai Sieyes
368459a96e Merge pull request #3160 from VOREStation/aro-destroy-medical-forever-because-obviously-i-hate-medical-duh 
Make syringe reuse a bad idea
 2018-02-28 20:50:08 -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
Leshana
93adeaf6cc Re-adds Eris tank sprites that were verwritten during sync 
* Also deletes pipes.dm which should be removed.
 2018-02-28 13:49:38 -05:00
Repede
33467710c6 TGS3 test implementation 2018-02-27 23:01:28 -05:00
Aronai Sieyes
1691569453 Merge pull request #3144 from VOREStation/aro-randkit 
Remove combat medkit from station spawns
 2018-02-27 21:51:10 -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
7b3c9ae8e9 POLARIS: Gibber tweaks 2018-02-27 13:29:40 -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
9128b2c68d POLARIS: Stub drop_location() 
No specific implementations for Polaris yet, copy some and use this commit too.
 2018-02-27 13:29:39 -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
Anewbe
4422b2f56d Merge pull request #4956 from VOREStation/vplk-pies-fileorg 
Reorganizes atmos pipes into separate files by type.
 2018-02-26 21:10:39 -06:00