cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,847 Commits 7 Branches 0 Tags
9029dfd48ddbe1b5c718bbde85f370484aa43ff4
Commit Graph

29132 Commits

Author SHA1 Message Date
Chompstation Bot
9029dfd48d [MIRROR] Prevented Teshari from selecting positronic brains. 2021-04-02 17:58:45 +00:00
Razgriz
47597f90c4 Update protean_powers.dm 2021-04-02 02:29:52 -07:00
Razgriz
1362cd2ea1 HOPEFULLY nerf protean metal eating this time 2021-04-02 02:28:19 -07:00
Razgriz
156df2c64d egg 2021-04-01 00:20:57 -07:00
Razgriz
d6a3cfb1de Merge pull request #1715 from CHOMPStationBot/upstream-merge-10054 
[MIRROR] [MIRROR] Non-mobs aren't allies
 2021-03-31 04:32:29 -07:00
Razgriz
2cbb6de9b8 Merge pull request #1712 from CHOMPStationBot/upstream-merge-10052 
[MIRROR] [MIRROR] Fixes runtime in prison_break.dm, line 214
 2021-03-31 04:32:08 -07:00
Razgriz
242d2b01a3 Merge pull request #1711 from CHOMPStationBot/upstream-merge-10053 
[MIRROR] [MIRROR] Fixes runtime in chunk.dm: line 91, I think?
 2021-03-31 04:31:39 -07:00
Razgriz
70b9abd0da Update thinktank_module.dm 2021-03-31 02:20:46 -07:00
Novacat
14c06e288a Merge pull request #10054 from VOREStation/upstream-merge-7999 
[MIRROR] Non-mobs aren't allies
 2021-03-31 09:14:37 +00:00
Novacat
21bce86db4 Merge pull request #10052 from VOREStation/upstream-merge-8001 
[MIRROR] Fixes runtime in prison_break.dm, line 214
 2021-03-31 09:13:17 +00:00
Novacat
f486590027 Merge pull request #10053 from VOREStation/upstream-merge-8000 
[MIRROR] Fixes runtime in chunk.dm: line 91, I think?
 2021-03-31 09:13:12 +00:00
Razgriz
2d9788c3ae Update phase.dm 2021-03-31 01:49:02 -07:00
Razgriz
962992d171 Added safety lock feature to phaseguns, same as frontier phaser 
Added safety lock feature to phaseguns, same as frontier phaser
 2021-03-31 01:35:35 -07:00
Novacat
3f99fb32f1 Merge pull request #10047 from Novacat/nova-ert 
Properly garbage collects carp
 2021-03-30 20:04:32 +00:00
Razgriz
e20f1dcedf Update asset_list_items.dm 2021-03-30 01:49:43 -07:00
Nadyr
4307a692e8 Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032 
[MIRROR] Adminbus Area Modifications
 2021-03-30 04:00:25 -04:00
Nadyr
8019cd3421 Merge pull request #1386 from CHOMPStationBot/upstream-merge-9445 
[MIRROR] [MIRROR] Department and Round Goals
 2021-03-30 03:46:36 -04:00
Nadyr
a1780f6678 Merge pull request #1702 from Verkister/patch-5 
Fixes V3 borgos properly
 2021-03-30 03:37:14 -04:00
Nadyr
e22a6d6eab Update randomverbs.dm 2021-03-30 03:34:45 -04:00
Nadyr
1f50e408c2 Merge pull request #1224 from CHOMPStationBot/upstream-merge-9632 
[MIRROR] Uplink and Adminverb Tweaks
 2021-03-30 03:26:24 -04:00
Nadyr
77ed13d9cf Merge pull request #1701 from Darlantanis/Teshari/Seromi-repathing-2 
Teshari/seromi repathing 2
 2021-03-30 02:58:48 -04:00
Nadyr
03afc88e27 Update shelters_vr.dm 2021-03-30 02:56:45 -04:00
Nadyr
c048cd365a Update shelter_atoms_vr.dm 2021-03-30 02:55:37 -04:00
Verkister
785a86ab36 Fixes V3 borgos properly 
oops.dmi
 2021-03-30 09:54:48 +03:00
Nadyr
83460960a5 Update loadout_xeno_yw.dm 2021-03-30 02:46:00 -04:00
Nadyr
2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Nadyr
a39d66305a Update station_vr.dm 2021-03-30 02:39:09 -04:00
Nadyr
e0b26777c2 Update teshari_vr.dm 2021-03-30 02:36:12 -04:00
Nadyr
470a3adb0b Merge branch 'master' into upstream-merge-10040 2021-03-30 02:32:40 -04:00
Nadyr
b36ea96802 Merge pull request #1694 from CHOMPStationBot/upstream-merge-10035 
[MIRROR] Makes weaversilk webs die from everything, not just fists + stun timer fix
 2021-03-30 02:30:48 -04:00
Nadyr
8905317316 Update custom_boxes_yw.dm 2021-03-30 02:23:21 -04:00
Nadyr
20e6989956 Update custom_clothes_yw.dm 2021-03-30 02:22:53 -04:00
Nadyr
304ff00156 Update loadout_fluffitems_yw.dm 2021-03-30 02:21:45 -04:00
Nadyr
7e298cd283 Update and rename seromi_yw.dm to teshari_yw.dm 2021-03-30 02:16:18 -04:00
Nadyr
22dd470d53 Update and rename seromi_ch.dm to teshari_ch.dm 2021-03-30 02:11:33 -04:00
Nadyr
e7b999247c Update loadout_xeno_yw.dm 2021-03-30 02:07:56 -04:00
Nadyr
70c292debf Merge pull request #1695 from CHOMPStationBot/upstream-merge-10036 
[MIRROR] Makes modifying ID cards not change the department if rank wasn't changed
 2021-03-30 01:54:58 -04:00
Nadyr
d73cc2b60a Update extrauniforms_yw.dm 2021-03-30 01:37:26 -04:00
Nadyr
22dcbebda4 Update tesh_synth_facemask.dm 2021-03-30 01:36:29 -04:00
Nadyr
1751df2e78 Update station_ch.dm 2021-03-30 01:35:31 -04:00
Nadyr
1958db0517 Update alien_ch.dm 2021-03-30 01:34:54 -04:00
Nadyr
8b3dd6414e Update loadout_xeno_ch.dm 2021-03-30 01:31:35 -04:00
Nadyr
5c3d16c981 Update station.dm 2021-03-30 01:20:26 -04:00
Nadyr
959eb92f41 Update clothing.dm 2021-03-30 01:13:36 -04:00
Nadyr
c1bd08a584 Update rig_pieces_vr.dm 2021-03-30 01:09:21 -04:00
Nadyr
b560f4a5c0 Update glasses.dm 2021-03-30 01:07:24 -04:00
Nadyr
f2385f3e9a Update clothing.dm 2021-03-30 01:05:26 -04:00
Nadyr
7915a9c9a8 Update loadout_xeno.dm 2021-03-30 01:03:25 -04:00
Nadyr
a777f6993d Merge branch 'master' into upstream-merge-10025 2021-03-30 00:58:05 -04:00
Chompstation Bot
00bd325d52 Fixes Teshari 2021-03-29 19:00:29 +00:00