cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,429 Commits 8 Branches 26 Tags
ecebb49ad12b842dc1d9ad9727dbb2381fefccee
Commit Graph

2079 Commits

Author SHA1 Message Date
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16 Merge pull request #810 from Zuhayr/bayupdate 
Bay update.
 2016-02-05 23:21:07 -05:00
Mark9013100
4782794909 Increases the list of items belts can hold 2016-02-05 23:13:40 -05:00
EmperorJon
c29c97dcce Merge pull request #905 from Zuhayr/resomi 
Seromi rename.
 2016-02-06 02:24:45 +00:00
Zuhayr
19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Zuhayr
43176f6640 Merge pull request #867 from Kelenius/grenadeFix 
Fixes #847
 2016-01-28 21:28:30 +10:30
Zuhayr
ad64a7941b Merge pull request #863 from Mark9013100/1/26/2016badgesmedals 
Adds more security badges/medals
 2016-01-28 21:26:56 +10:30
Mark9013100
51a9cef15f Adds more security badges/medals 2016-01-28 00:33:49 -05:00
Kelenius
7ad3cea9ad Fixes #847 2016-01-27 12:07:35 +03:00
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486 Revert "Removes Resomi." 
This reverts commit c9f579e00a.
 2016-01-27 13:48:48 +10:30
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Neerti
02b8599123 Merge pull request #739 from Datraen/Trayfix 
Allows trays to drop their items, adds color to material items on trays
 2016-01-15 22:40:54 -05:00
Datraen
460075b360 Slight optimization in dropped, adds colors to material items. 2016-01-14 18:29:49 -05:00
Datraen
daeba35c6d Merge pull request #778 from Zuhayr/polaris 
Fixes.
 2016-01-13 14:18:24 -05:00
Datraen
075343c62d Gives implants show_messages access. 2016-01-13 12:48:09 -05:00
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
905cb5943d Readds blindness removal to imida 
zoline and organ surgery. Stops imidazoline healing robotic eyes.
 2016-01-09 13:24:46 +10:30
Datraen
5699306cf3 Trays now drop items properly 2016-01-07 20:31:05 -05:00
PsiOmegaDelta
39bbca416a Adds missing istype() check before the secure brief case emag check. 
Fixes #11900.
 2016-01-06 18:31:39 +01:00
Zuhayr
bda43c7457 Merge pull request #713 from Woodratt/1.4.0_Extinguisher_fix 
1.4.0 Fire extinguishe fixes and tweaks
 2016-01-03 19:20:56 +10:30
PsiOmegaDelta
2e89b7c718 Fixes the canUnEquip() proc. 
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
 2016-01-02 16:59:16 +01:00
woodratt
300cafd987 1.4.0 Fire extinguishe fixes and tweaks 
- Tweaks the amount that fire extinguisher holds and particles they send out. According to Spookerton there's no advantage to having more than 3 particles. In tests this seems to be the case as well.
- Also a minor edit to the code for patting people out that are on fire (as suggested by Spookerton), should help with folks that get set on fire.
- Added more fire extinguishers through medical.

-- One note -- Found in testing the fire extinguishers, water on tiles does not go away over time. Fire extinguishers appear to spray water on the tiles. Didn't know a way around this or how to fix this.
 2015-12-31 20:57:18 -08:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf 
Added Nerf weapons to Cargo.
 2015-12-24 06:47:48 -05:00
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
8602f07d31 Allowed grenades to be stuffed into mouths and primed. 2015-12-24 21:55:05 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Sebastian Broberg
90f27ca42c Fixes chemgrenades 
Fixes #11686
 2015-12-23 23:46:53 +01:00
Zuhayr
407ec5645d Merge pull request #563 from Sabess/master 
Adds Brass Knuckles
 2015-12-22 14:15:22 +10:30
Zuhayr
c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Zuhayr
6faeea5462 Fixes for the asteroid turf post-changes. 2015-12-21 04:59:32 +10:30
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
sabess
00323ad7ad The Final Fix probably maybe hopefully 2015-12-19 14:11:26 +11:00
sabess
a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00