cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,062 Commits 7 Branches 0 Tags
64ed1878cc54d40e23063c7b04ad6a7b8683c6d6
Commit Graph

23900 Commits

Author SHA1 Message Date
Repede
64ed1878cc Merge branch 'master' into larger_bodybags 2019-10-17 20:10:01 -04:00
Repede
22e602deb3 Merge branch 'master' into larger_bodybags 2019-10-17 20:09:00 -04:00
Repede
33f69bc450 Merge branch 'master' into self 2019-10-17 19:12:40 -04:00
Repede
e7a5341f2d Adds f13 (Mauser) brand cigarettes to game vending machines. 2019-10-17 19:09:57 -04:00
TrilbySpaceClone
77b13577a1 grave storge 2019-10-16 21:18:18 -04:00
Hawk_v3
8edc441c63 Renames for descriptiveness. 
R&D now knows exactly what every device is.
 2019-10-12 21:43:52 +01:00
Hawk_v3
a316232d82 Merge branch 'patch-7' into cells 2019-10-12 21:36:20 +01:00
Hawk-v3
c1af30b4bf Revert "Revert "Adds in two new cells for sci to get!"" 
This reverts commit 9f3802b9a0.
 2019-10-12 21:36:02 +01:00
Trilbyspaceclone
8945b98d79 re-adds the alien cell 2019-10-10 19:54:54 -04:00
Trilbyspaceclone
f4e55ccc2c Merge branch 'master' into patch-7 2019-10-10 19:50:27 -04:00
Repede
2392de5023 Merge branch 'master' into self 2019-10-09 19:46:31 -04:00
Repede
b24fee0c73 AI hologram makes Teshari less lonely 2019-10-09 19:42:22 -04:00
Hawk_v3
315184978c Merge remote-tracking branch 'server/master' into patch-7 2019-10-09 17:42:17 +01:00
Trilbyspaceclone
56dde59333 Update power_cells.dm 2019-10-09 11:52:26 -04:00
Trilbyspaceclone
f3b8e49fbd Update power_cells.dm 2019-10-09 11:47:29 -04:00
Trilbyspaceclone
407f21ad05 tech levels 2019-10-09 11:29:31 -04:00
Trilbyspaceclone
adf9ff0cf1 corrects item paths 
cells were already taken, my bad
 2019-10-09 11:26:36 -04:00
Hawk-v3
9f3802b9a0 Revert "Adds in two new cells for sci to get!" 2019-10-09 16:14:07 +01:00
Repede
7bd184600a Self-indulge commit: Adds CC Officer colored uniform and cloak for Teshari. 
Fluffed it to Strix Hades as a loadout option.
 2019-10-08 19:20:27 -04:00
Hawk-v3
7cde34bfb3 Merge branch 'master' into master 2019-10-08 15:27:01 +01:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Novacat
bac8237fb2 Update prometheans.dm 2019-10-08 01:01:31 -04:00
Fel
0bab8c2c8c Prometheans clean everything, not just the tile they're on. 2019-10-08 00:52:47 -04:00
Novacat
369b9a0914 Merge pull request #6039 from Screemonster/chimeratweaks 
chimera examinetext
 2019-10-07 15:51:18 -04:00
Trilbyspaceclone
262517ee06 Apply suggestions from code review 
Russian to Engish is hard

Co-Authored-By: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com>
 2019-10-07 06:29:28 -04:00
Hawk-v3
b728dacf41 Merge branch 'master' into Powergaming 2019-10-06 21:17:20 +01:00
Screemonster
513f59ea92 chimera examinetext 2019-10-06 20:14:26 +01:00
Novacat
a6654d7bd4 Merge pull request #6035 from VOREStation/upstream-merge-6471 
[MIRROR] Blind port of Bay Radiation Subsystem
 2019-10-06 14:30:59 -04:00
Unknown
dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Novacat
149162a1e7 Merge pull request #6029 from Rykka-Stormheart/shep-dev-catalogue 
Adds Cataloguer Data to multiple simple_mobs that lacked it
 2019-10-06 03:50:32 -04:00
Novacat
d868f99059 Merge pull request #6037 from VOREStation/upstream-merge-6473 
[MIRROR] Port weight/body types to traits
 2019-10-06 03:48:19 -04:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype 
Port weight/body types to traits
 2019-10-06 03:34:05 -04:00
Atermonera
cd34901747 Merge pull request #6474 from Cerebulon/newsoct19 
June-October News Update
 2019-10-06 03:33:55 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Novacat
0dceea0b95 Update corrupt_hounds.dm 2019-10-05 22:56:15 -04:00
TrilbySpaceClone
c245955ead Suggestions 2019-10-05 22:20:05 -04:00
TrilbySpaceClone
c1f2d35b13 Ill maintain this I sware! 2019-10-05 21:43:09 -04:00
Novacat
2ae04b4264 Fixes typo in flexitac melee protection (#6470) 2019-10-05 21:12:21 -04:00
Trilbyspaceclone
5eae6a4200 Update power_cells.dm 
Why did this complie locally?
 2019-10-05 18:42:17 -04:00
TrilbySpaceClone
af68971451 maybe it just works 
whom knows
 2019-10-05 18:12:59 -04:00
Novacat
364b92bf0a Update golem.dm 2019-10-05 15:01:44 -04:00
Hawk_v3
1a360ed49c Printers print Fields correctly now. 
You're all welcome!
 2019-10-05 19:57:41 +01:00
Rykka
59f58ff365 Polaris fucking edits. hurrah. WATCH IT BREAK FILEDIFF AGAIN 2019-10-05 12:36:40 -06:00
Rykka
14f8f1b8d5 Hopefully fix filediffs 2019-10-05 12:07:22 -06:00
Hawk_v3
6e801b1e8e Map Updates. 2019-10-04 01:52:44 +01:00
Hawk_v3
4efcad8fe2 So you can't do that. 
Fixed it.
 2019-10-03 22:36:48 +01:00
Hawk_v3
406fc1a567 Merge remote-tracking branch 'server/master' 2019-10-03 22:21:45 +01:00
Hawk_v3
5e4a914604 WIki Link Standardisation 
All the links should point to our wiki now. All that's left is for it to be filled out.
 2019-10-03 22:21:37 +01:00
Repede
8fb8de7ef4 Merge branch 'master' into paperballs 2019-10-03 11:59:13 -04:00
gozulio
02ab22cae8 Properly fixes white cane 
Properly fixes white cane fluff item and corrects misleading comment in example code comment.
 2019-10-02 21:55:27 -04:00