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,647 Commits 7 Branches 0 Tags
c11c37514c52a25efabc9c5f3a973be40179a2c5
Commit Graph

36402 Commits

Author SHA1 Message Date
Heroman
3e31046aef Fixes file discrepancy for autolathe ammo recipies 2019-10-14 05:35:30 +10:00
Poojawa
9fe126e53e swhat I gets for not compiling a 'ohwait' check 2019-10-13 03:18:58 -05:00
Poojawa
8c059c9403 double check to stop that sound loop on release 2019-10-13 02:15:44 -05:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05: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
Hawk-v3
0e88dfdfb8 Merge branch 'master' into patch-7 2019-10-12 18:39:15 +01:00
Novacat
3351edd916 Update turf_changing.dm 2019-10-12 12:21:38 -04:00
Unknown
e2ea09a1be Fixes open space spawning over sky tiles 2019-10-12 12:10:04 -04:00
DigitalSquirrel95
30f751b23f Update vote.dm 2019-10-11 02:29:58 -04:00
DigitalSquirrel95
bec4591556 Changes the crew transfer message to be more IC friendly. 
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs.  This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.

Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
 2019-10-11 01:43:00 -04: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
gozulio
9b2c69963c Merge branch 'master' into master 2019-10-10 13:17:35 -04:00
gozulio
052d2df8e0 Merge pull request #7 from Yawn-Wider/master 
Upstream Merge 2019-10-09
 2019-10-09 22:55:03 -04:00
gozulio
8ea1e487bb Fixes R-UST Engine submap 
Fixes radiation leakage in R-UST engine submap
 2019-10-09 22:53:05 -04:00
Repede
2392de5023 Merge branch 'master' into self 2019-10-09 19:46:31 -04:00
Repede
179de51da9 Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self 2019-10-09 19:42:57 -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
e70327eb71 Merge branch 'master' into self 2019-10-08 19:26:51 -04: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
Cebutris
5f5572b33c removes med/sec 2019-10-08 18:27:36 -04:00
Cebutris
9372d4e37b oops i forgot a line 2019-10-08 18:01:54 -04:00
Cebutris
ed2075d7c5 command-secretary access change 2019-10-08 17:52:07 -04:00
Novacat
df05103c06 Merge pull request #6042 from VOREStation/upstream-merge-6476 
[MIRROR] Printers print Fields correctly now.
 2019-10-08 12:50:37 -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
Atermonera
ea876b37cf Merge pull request #6476 from Hawk-v3/master 
Printers print Fields correctly now.
 2019-10-08 04:22:16 -04:00
Atermonera
93bbae11e7 Merge pull request #6475 from R1f72r/Phoronboreupgrade 
Allows you to upgrade Phoron Bore with manipulators
 2019-10-08 04:22:06 -04: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
daefe0ba5b Why were these still here 2019-10-06 14:19:08 -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