cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,132 Commits 9 Branches 26 Tags
396c8afdff3a040683fea79f02f4e67925206194
Commit Graph

4941 Commits

Author SHA1 Message Date
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
Heroman
b3e01dc515 Restricts AI intercepting messages 2019-09-04 04:23:16 +10: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
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
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04: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
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
Anewbe
03ff9fa0fe Merge pull request #6284 from Atermonera/weather_app_atmos_reading 
fixes communicator weather app's air reading
 2019-07-19 16:19:36 -04:00
if there were two guys on the moon
2b155eb2a5 VSedit 2019-07-19 09:56:57 +01:00
if there were two guys on the moon
4baf7a58e7 VS edit 2019-07-19 09:29:02 +01:00
if there were two guys on the moon
f4f2d6bf08 defib 2019-07-19 09:24:07 +01:00
if there were two guys on the moon
d6891f3bb2 defib scanners 2019-07-19 09:07:55 +01:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Spades
5a7bdcebf4 Merge pull request #5378 from Novacat/nova-survival 
Minor Fixes
 2019-07-05 07:04:18 -04:00
Atermonera
c4c8457a82 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2 
Flashes actually work as said on the tin.
 2019-07-03 23:10:55 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
Unknown
52c1d3a491 Minor Fixes 
- Fixes problems with Alraune Breathing
- Cleans up Subspace Radio code
 2019-06-26 22:38:54 -04:00
Anewbe
1adc4790be Merge pull request #6221 from mistyLuminescence/bettersplinting 
Head/chest/groin splints
 2019-06-21 17:06:38 -04:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208) 
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
 2019-06-21 00:14:05 -04:00
Novacat
03a3944f36 An assortment of Lighting Stuff 2019-06-18 19:57:40 -04:00
Mechoid
595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215) 
* MakeMeleeGreatAgain

* Where is melee defined?!
 2019-06-18 05:51:23 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms 
Adds worms
 2019-06-11 17:35:11 -04:00
Ketrai
861f3b6086 ohno 2019-05-31 18:45:51 +02:00
Ketrai
ba79dc55d1 trash items 2019-05-31 17:41:23 +02:00