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

35865 Commits

Author SHA1 Message Date
izac112
7c492a3d17 feel united woOoah - captmatt4, fluff Korei Laskor 
Matt's fluff is done.
 2019-09-17 06:43:16 +02:00
izac112
dfb4cea0d7 move your feet and - captmatt4, fluff Eliana Noya 2019-09-17 06:41:21 +02:00
izac112
2f071e3130 Everybody - captmatt4, fluff Payton Joghs 2019-09-17 06:39:03 +02:00
izac112
11256581d8 benl8561, fluff Quanah Hastings 
benl8561, fluff done
 2019-09-17 06:28:37 +02:00
izac112
d0d1cc7a68 benl8561, fluff M.I.S.S.Y 2019-09-17 06:26:51 +02:00
izac112
c02c3c0f14 BlackAngelsAce, fluff Aurora Goldtail and Strix Hades. 
this is all of ace's fluff.
 2019-09-17 06:22:42 +02:00
izac112
a4b0b15175 BlackAngelsAce, fluff Aurora Goldtail 2019-09-17 06:16:51 +02:00
izac112
3f4995cc39 BlackAngelsAce, fluff Wolfgang Jaeger 2019-09-17 06:12:04 +02:00
izac112
59be074b7b Blackangelsace, fluff Madoka Koto. 2019-09-17 06:04:24 +02:00
izac112
97c0bdf692 Start of porting over the fluff items, to the new system. 2019-09-17 05:50:27 +02:00
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Novacat
536f7a946a Update machinery.dm 2019-09-15 23:14:03 -04:00
Heroman3003
421dbe9ab8 removes extra check 2019-09-16 13:06:49 +10:00
Heroman3003
3ef252a2b9 Fixes for real 2019-09-16 13:06:31 +10:00
Hawk-v3
b7a433f914 Merge branch 'master' into space-fox-genocide 2019-09-16 02:34:22 +01:00
Unknown
45d493c0b0 Adds bar shelter capsule to vendors 2019-09-15 21:03:58 -04:00
Novacat
d5c404927f Merge pull request #5873 from VOREStation/upstream-merge-6455 
[MIRROR] Properly fixes library computer runtime
 2019-09-15 17:43:41 -04:00
Atermonera
8565190e87 Properly fixes library computer runtime (#6455) 
* Fixes runtime in machinery/CanUseTopic() not providing correct number of arguments to ..()

* Fixes ghost interaction bug
 2019-09-15 17:10:24 -04:00
Heroman
7088a5e6cc Fixes Roiz Lizden's and Chakat Taiga's fluff items 2019-09-16 04:51:12 +10:00
Novacat
acc7f7d3e6 Merge pull request #5864 from Heroman3003/fixes2 
Fixes more
 2019-09-14 22:37:50 -04:00
Heroman
6e06dd8f32 Fixes 2019-09-15 12:29:21 +10:00
Unknown
3c4370e1d0 Fixes wrong path 2019-09-14 21:49:03 -04:00
Unknown
560c74a25e Moves Asset protection stat changes 2019-09-14 21:45:53 -04:00
Unknown
b9c1d9b4b4 Adds ERT Janitor suit 
Adminspawn only
 2019-09-14 21:44:55 -04:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Cebutris
6db6d6f0c7 deletes more KHI, reworks some wording and other corps 2019-09-14 15:13:11 -04:00
Cebutris
fd8d450258 more KHI delete 2019-09-14 13:34:23 -04:00
Cebutris
23a8a98909 delete mispelling 2019-09-14 13:31:38 -04:00
Cebutris
4346225077 delete more khi 2019-09-14 13:30:32 -04:00
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Unknown
d4b70dd33d Emergency Hotfix 2 2019-09-14 02:50:58 -04:00
Novacat
7f5256b4d4 Merge pull request #5855 from Novacat/nova-basicfixes 
Emergency quick bugfixes
 2019-09-14 01:48:08 -04:00
Unknown
e0a762949d Fix Part 2 2019-09-14 01:39:06 -04:00
Novacat
013437f96f Merge pull request #5854 from Heroman3003/prelabel 
Fixes Blood-Onator
 2019-09-14 01:20:12 -04:00
Unknown
e9c94bb553 Emergency quick bugfixes 2019-09-14 01:16:53 -04:00
Heroman
31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Novacat
5641105538 Merge pull request #5820 from Heroman3003/morfix3 
Makes morphs sturdier
 2019-09-14 00:41:02 -04:00
Novacat
c312973379 Merge pull request #5848 from Novacat/nova-survival 
Protean Changes
 2019-09-14 00:40:29 -04:00
Novacat
305e79db40 Merge pull request #5834 from Novacat/nova-heterochromia 
Cargo hardsuit changes
 2019-09-14 00:39:23 -04:00
Novacat
b9af72e1c8 Merge pull request #5836 from Novacat/nova-pathfinder 
Adds rig modules to R&D
 2019-09-14 00:39:13 -04:00
Novacat
396c8afdff Merge pull request #5838 from Mewchild/MC-Sofa 
Ports Sofas from CitRP
 2019-09-14 00:39:02 -04:00
Novacat
ab256b75b3 Merge pull request #5846 from Novacat/nova-basicfixes 
Shelter Capsule Improvements
 2019-09-14 00:38:45 -04:00
Novacat
6536770991 Merge pull request #5837 from Novacat/nova-ert 
Centcom Tweaks
 2019-09-13 21:34:33 -04:00
Novacat
0e44471c07 Merge pull request #5845 from Heroman3003/remedbaying2 
Remaps entirety of Medbay
 2019-09-13 21:34:11 -04:00
Novacat
abe19fb977 Merge pull request #5840 from Mewchild/MC-FluffTab 
Refactors Fluff Items, moves them to be loadout options
 2019-09-13 20:45:01 -04:00
Unknown
ccbcdf55c0 Another all access ID removed 2019-09-13 20:34:56 -04:00
Novacat
963436e8a3 Update loadout_fluffitems_vr.dm 2019-09-13 20:17:21 -04:00
Novacat
4dbf311e51 Deletes Aronai's all access ID 2019-09-13 20:00:37 -04:00
Heroman
06d3891be2 Makes mice start with 0 nutrition 2019-09-14 07:40:15 +10:00