cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 9 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

35865 Commits

Author SHA1 Message Date
Heroman
6f30d97bb9 Adjusts modes of some buttons in character creation 2019-08-18 08:03:04 +10:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Heroman
4b0cc1810e Fixes a typo 2019-08-18 05:34:13 +10:00
Hawk-v3
dbc96f8de7 Merge branch 'master' into izac 2019-08-17 18:52:10 +01:00
DameonOwen
d1d42af439 One last change to the path 2019-08-17 08:35:20 -04:00
DameonOwen
e04724bdea I'm tired, okay? 2019-08-16 23:12:51 -04:00
DameonOwen
5eedd046a3 Port limbs, wings from Aphrodite 2019-08-16 23:09:32 -04:00
Novacat
8320bdcd19 Merge pull request #5632 from Heroman3003/size-borg-fix 
Fixes borgs not starting with their sizes set
 2019-08-16 22:39:46 -04:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Heroman
8872a08a1a Fixes bugs with suit sensors and tether levels 2019-08-17 09:24:57 +10:00
Heroman
b2f2d12da6 Fixes borgs not starting with their sizes set 2019-08-17 06:53:04 +10:00
Michiyamenotehifunana
81c56fefd8 Makes Cargo Tugs Great Again (and a minor tweak) 2019-08-16 12:37:08 +08:00
Unknown
98fd57ae3c Final touches 2019-08-15 23:18:05 -04:00
Michiyamenotehifunana
ce4f248381 Okay that should be all 2019-08-15 23:06:26 +08:00
Michiyamenotehifunana
6c8589fa4a Whoops I missed a bit 2019-08-15 22:45:30 +08:00
Michiyamenotehifunana
3a676ad02e Adds Toricrates and stuff 2019-08-15 22:22:28 +08:00
Heroman
3e9456125a Restricts friendly manhack grenades to offstation use 2019-08-15 20:12:59 +10:00
Anewbe
4540551117 Merge pull request #6403 from Heroman3003/airuntime 
Fixes language runtime upon ai creation
 2019-08-14 21:38:28 -04:00
Mewchild
4ae966d3ff Removes Awoo speech 2019-08-14 03:47:01 -05:00
Novacat
f6fded4c4b Merge pull request #5607 from Heroman3003/customsay-fix 
Fixes customsay not working for non-admins
 2019-08-14 03:25:10 -04:00
Novacat
d611e2c657 Merge pull request #5605 from Ketrai/master 
Indoor fishing tweaks
 2019-08-14 03:24:50 -04:00
Heroman
349cc65134 Fixes customsay not working for non-admins 2019-08-14 17:06:37 +10:00
Novacat
8c5fea9225 Merge pull request #5604 from Heroman3003/lightingpower 
Reduces power consumption of active lights
 2019-08-14 03:04:59 -04:00
Ketrai
4fb9362b05 Makes the fishing time increase for indoor fishing only 10% longer 2019-08-14 08:57:45 +02:00
Heroman
bab3ae66dd Reduces power consumption of active lights 2019-08-14 16:50:30 +10:00
Novacat
36b3256045 Merge pull request #5595 from Heroman3003/fishing-pools 
Changes fishing loot pools for indoor fishing
 2019-08-14 00:32:30 -04:00
Novacat
77a59382d8 Update fishing_vr.dm 2019-08-14 00:18:35 -04:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
Heroman
6d43c8f45a Changes fishing loot pools for indoor fishing 2019-08-14 11:31:47 +10:00
izac112
0980775d93 Vasharr fluff #2 2019-08-14 02:03:17 +02:00
izac112
e2570c5585 Vasharr fluff 2019-08-14 01:34:06 +02:00
izac112
a3037eb703 Fluff cleanup 'Generalpantsu' 2019-08-14 01:08:04 +02:00
izac112
2734fe7a65 Cleaning up fluff 'Deathty' 2019-08-14 01:05:00 +02:00
Michiyamenotehifunana
1e34c97a9a Turns NIFSoft disks into neuromods 2019-08-13 14:02:36 +08:00
TheFurryFeline
223c23c100 No Blindess 
Make it so you're not mechanically blind so you can hear regular emotes. But ICly, you'd still be blind, so.... Go nuts with that. :>
 2019-08-12 18:02:34 -04:00
Novacat
0b8864135c Merge pull request #5586 from VOREStation/upstream-merge-6381 
[MIRROR] Fixes Mech Cable Layer
 2019-08-12 17:28:49 -04:00
TheFurryFeline
58d1a95454 Sod it 
Spent like five hours trying to get it to work in a different file but it might well be better to just.... Do a 1:1 port with //VoreStation edit comments as per code practice here.
 2019-08-12 16:51:43 -04:00
Anewbe
f758d8fb38 Merge pull request #6381 from Nalarac/CableLayer2 
Fixes Mech Cable Layer
 2019-08-12 16:33:41 -04:00
Anewbe
74ab7a563f Merge pull request #6390 from Heroman3003/bot-patrols 
Makes bot patrolling into a map var
 2019-08-12 16:32:28 -04:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Freebie Orange Jumpsuit
 2019-08-12 14:40:23 -04:00
Atermonera
6bb746995e Merge pull request #6401 from Shophaune/dronehatissues 
Maybe fixes drone hat issues
 2019-08-12 13:58:27 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
TheFurryFeline
de2438a860 Find Your Seats 
Ports ChompStation facesitting, pretty much. :>
 2019-08-12 10:14:10 -04:00
Spades
de8be8f2dc Merge pull request #5578 from BlackMajor/Dumb-verb 
Adds an admin verb for spawning players as mobs with their vore prefs intact
 2019-08-12 09:41:01 -04:00
BlackMajor
419db94458 Adds requested changes yeet 2019-08-11 17:22:20 +12:00
BlackMajor
67885bca42 Oh wait that's important 2019-08-11 02:03:32 +12:00
BlackMajor
1035c6e8dd ew empty lines 2019-08-11 01:45:39 +12:00
BlackMajor
da7949b4b6 I should probably remove those debug messages 2019-08-11 01:38:57 +12:00
BlackMajor
0a2e805735 Adds spawn character as mob verb 2019-08-11 01:37:36 +12:00
Unknown
1cd0ee6daf Purges bad indentation 2019-08-10 04:06:08 -04:00