cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 17:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,728 Commits 8 Branches 0 Tags
dfbbbf3cfda55bfc69d824c9ccd2f7cf45020cfd
Commit Graph

5080 Commits

Author SHA1 Message Date
Hawk_v3
7f0746e44c Clearing out some more. 
NSFW is now the NSCW and the ML-3M is the ML-3.

Also, no, fluff items with TELEPORTERS are no bueno.
 2019-09-23 21:40:26 +01:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown
8392aa5202 Subspace Radio slot bugfixes 
- Subspace Radio now can be slotted in hardsuit suit slots.
- Subspace Radio now works if slotted in a suit slot.
 2019-09-22 09:05:21 -04:00
Novacat
7a43b97988 Merge pull request #5902 from Novacat/nova-weapons 
Ports pan-slavic from Baystation
 2019-09-20 12:12:13 -04:00
Heroman3003
ac3f9ea671 Makes threshold be based on specific organ rather than straight 10 2019-09-20 12:42:38 +10:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Heroman
c3ad552d64 Implements an icon for Advanced Nanopaste (by Chaoko99) 2019-09-19 03:55:50 +10:00
Heroman
444c06b8d1 Adds edit, variables 2019-09-18 17:24:23 +10:00
Heroman
0fb140d01c Nerfs regular nanopaste, adds advanced one 2019-09-18 16:35:42 +10:00
Hawk-v3
b7a433f914 Merge branch 'master' into space-fox-genocide 2019-09-16 02:34:22 +01: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
Novacat
ab256b75b3 Merge pull request #5846 from Novacat/nova-basicfixes 
Shelter Capsule Improvements
 2019-09-14 00:38:45 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Hawk_v3
fc97b8233b Merge remote-tracking branch 'upstream/master' 2019-09-08 18:55:37 +01:00
Heroman
b3e01dc515 Restricts AI intercepting messages 2019-09-04 04:23:16 +10:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec Merge remote-tracking branch 'upstream/master' 2019-08-30 21:38:17 +01:00
Anewbe
083a0634a0 Merge pull request #6429 from Heroman3003/idfix 
Fixes editing colony director IDs editing global 'station access' list
 2019-08-29 18:27:58 -04:00
Novacat
a006728e5d Merge pull request #5708 from Novacat/nova-basicfixes 
Minor Fixes
 2019-08-29 15:07:28 -04:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Hawk_v3
0973c49633 Merge remote-tracking branch 'upstream/master' 2019-08-27 00:22:31 +01:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Verkister
f7a2580521 Bandaid for helper.dm runtime lag 
The latest news snippet being missing from communicator UI is a small price to pay for eliminating a severe runtime cascade for now.
 2019-08-21 18:44:20 +03:00
Heroman
4b0cc1810e Fixes a typo 2019-08-18 05:34:13 +10:00
Heroman
e0138738f4 Limits new equipment properly 2019-08-17 12:35:44 +10:00
Heroman
3e9456125a Restricts friendly manhack grenades to offstation use 2019-08-15 20:12:59 +10:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Atermonera
f863fa8f7f Merge pull request #6357 from Michiyamenotehifunana/HanalSprites 
Resprites Health Analyzers and Adds Scanning Animations
 2019-08-04 17:21:03 -04:00
Spades
f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites 
Resprites Advanced Burn and Trauma Kits
 2019-08-03 07:51:27 -04:00
Spades
4ce97f4a6e Merge pull request #5478 from mistyLuminescence/defib 
Defib Scanners
 2019-08-03 07:51:14 -04:00
Anewbe
7977f50b1c Merge pull request #6359 from Nalarac/patch-5 
Updates Supermatter Guide Book
 2019-08-02 14:06:45 -04:00
Novacat
d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328 
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
 2019-07-31 02:10:06 -04:00
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Andrew
e6f54d671a Cyborgs Can See and Repair Holes in Ceiling (#6347) 
* Cyborgs Can See and Repair Holes in Ceiling

* Adds changelog because I keep forgetting
 2019-07-27 13:06:52 -04:00
CameronWoof
172314f04c more compliance 2019-07-26 23:43:11 -07:00
CameronWoof
2cd2b7a981 code compliance 2019-07-26 23:10:41 -07:00
CameronWoof
1aca0bff38 Resprites Advanced Burn and Trauma Kits 2019-07-26 20:13:09 -07:00
Hawk_v3
ff20e10352 Merge remote-tracking branch 'upstream/master' 2019-07-20 22:51:13 +01:00