cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 07:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,298 Commits 8 Branches 26 Tags
09efeaea5ce1fac7f4e916a3abc380fcf5fe52ae
Commit Graph

6293 Commits

Author SHA1 Message Date
Chinsky
b3248bf914 Merge pull request #4060 from DJSnapshot/dev-freeze 
Improvements to how floors become dirty
 2013-12-16 22:12:54 -08:00
DJSnapshot
b79ad45087 De-clunking the revised dirt code. 2013-12-16 22:07:31 -08:00
DJSnapshot
e112820ead Improvements to floors becoming dirty. They now become dirty over time instead of suddenly being really dirty at 50 steps. 2013-12-15 22:58:10 -08:00
Zuhayr
824b871902 Fixes the nuke suit spawn proc. 2013-12-15 14:50:24 +10:30
Zuhayr
92c4d6c66c Nook ops species-specific hardsuits on spawn. 2013-12-15 13:18:32 +10:30
Zuhayr
7940ac6cda Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-13 12:48:25 +10:30
DJSnapshot
a8eebd17d0 Grammar fix and fix to c45 being declared twice in boxes.dm 2013-12-08 12:25:00 -08:00
Zuhayr
502e39e341 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-08 12:22:31 +10:30
Ccomp5950
fea1819260 Runtime fix: It was a bad idea to have this stuff in New() 
So now it gives a default values and moves on.
 2013-12-07 05:17:04 -06:00
Zuhayr
17380e308e Extra check in secure case interaction for aliens. 2013-12-05 22:04:11 +10:30
Zuhayr
ced5cf2020 Actually fixes #4030, previous commit fixes #4014 2013-12-05 21:59:12 +10:30
Zuhayr
a110cfaed7 Fixes #4030 2013-12-05 21:58:33 +10:30
Zuhayr
78e09f33d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-05 21:32:23 +10:30
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master 
Minor fixes
 2013-12-05 02:56:06 -08:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2 
DNA2 - A recode of DNA
 2013-12-05 02:39:55 -08:00
Chinsky
9938c152ff Merge pull request #4023 from Zuhayr/feature 
Ability skeleton code, basic cryopod functionality.
 2013-12-04 13:50:17 -08:00
Ccomp5950
52d328623a Tanks will also keep up with who manipulated them last. 
Tanks placed in canisters, scanned with PDA or other analysis tool will set the manipulated_by variable to whoever did so.

The idea is that this person is aware what's in the tank and will act accordingly when you press the internals HUD icon.

If the user was the last person to manipulate the tank (or it's not been manipulated) then the user is smart about selecting the proper tank.

If the user was not the last person to manipulate the tank then he is only checking the pressure gauge to see what tank is fullest that matches his species breath_type

If that tank has nasties in it, welp he is going to get a breathful of nasties.
 2013-12-03 23:01:42 -06:00
Kilakk
d2c07184f7 Merge remote-tracking branch 'upstream/dev' into dev-radio 
Conflicts:
	maps/tgstation2.dmm
 2013-12-03 21:24:03 -05:00
Chinsky
0074452f29 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-03 19:42:17 +04:00
Zuhayr
0a0a71a66c Added cryo log, item recover strings and various bits and bobs to cryopods. Restored 9000 tick delay on use. 2013-12-03 22:31:22 +10:30
Zuhayr
b35e8cd8fb Added cryopod console with item recovery. 2013-12-03 22:05:35 +10:30
Zuhayr
411308b287 Added item preservation, cryo announcements and a minimum timer to cryopods. 2013-12-03 21:28:30 +10:30
Zuhayr
7effb3a909 Basic functionality for crypod despawners. 2013-12-03 04:21:37 +10:30
Zuhayr
69d84931e6 Changelog merge resolution. 2013-12-03 01:07:17 +10:30
Ccomp5950
624068cc4f Emergency Insertion - Supermatter Manual. 
/obj/item/weapon/book/manual/supermatter_engine
 2013-12-01 19:31:25 -06:00
Kilakk
13abdf9fdc Moved the CentComm channels onto their own tcomm network thing 
* 144.1 and 144.3 are accessible through regular headsets, silly people were using them to listen in on response teams
* Moved the ERT and Deathsquid channels to 134.5 and 134.1 respectively
* Created presets for a tcomms setup on the CentComm zlevel
 2013-12-01 18:58:16 -05:00
Rob Nelson
53c2aff420 DNA2 - A recode of DNA 
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
 2013-12-01 00:04:27 -08:00
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master 
merge master into dev-freeze
 2013-11-30 15:22:31 -08:00
volas
e33490d80a Fixes: AI won't steal fax, and mice won't flip tables anymore. 2013-11-30 23:54:06 +04:00
Chinsky
9437241425 Merge pull request #3995 from Ccomp5950/dionaea_jobban 
Admin request:  Added ability to jobban players from becoming Dionaea nymphs
 2013-11-29 23:00:26 -08:00
Chinsky
e698c842a7 Merge pull request #3994 from Ccomp5950/exosuit_handcuffs 
Players will now no longer be able to jump in exosuits while handcuffed.
 2013-11-29 17:33:00 -08:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:11:36 +04:00
Chinsky
b4baf60414 Merge pull request #3989 from Ccomp5950/syndicate_id_fix 
Hotfix for Syndicate ID's not being able to be assigned names / job
 2013-11-29 17:05:16 -08:00
Ccomp5950
675f46fb80 Oops, Typo. What a difference that exclamation point can make. 2013-11-29 15:26:45 -06:00
Ccomp5950
05492cc921 Created a check to see if there is a registered user of the syndicate card, 
if there isn't it assignes the first person who tries to change their name with it as the registered user.
 2013-11-29 15:07:39 -06:00
Ccomp5950
3be474bab8 Admin request: Added ability to jobban players from becoming Dionaea nymph 2013-11-28 22:35:12 -06:00
Ccomp5950
a8738ddc4b Players will now no longer be able to jump in exosuits while handcuffed. 2013-11-28 21:35:04 -06:00
Ccomp5950
287860b377 Force name update on new() of syndicate ID cards 
Will make sure there is no null names making players unclickable as well as making syndicate cards work
 2013-11-28 20:52:38 -06:00
Ccomp5950
497c111796 Bugfix: Hyposprays now fit in medical belts. 
Problem:  Person fixing bug #2006 was a bit too specific about type of autoinjectors able to fit in belt.

Solution:  Be less specific.  Now hyposprays fit in belts.
 2013-11-28 19:25:43 -06:00
Ccomp5950
1f76f4cfd0 Hotfix for Syndicate ID's not being able to be assigned names / occupations. 2013-11-28 18:43:46 -06:00
Chinsky
6b23a0d7c0 Merge pull request #3982 from Mloc/bs12-hooks 
Implements hooks, an easier way to write code to be called at startup/roundstart/roundend/etc.
 2013-11-28 05:32:08 -08:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Mloc-Argent
6095a3a249 Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks 2013-11-25 21:17:07 +00:00
Mloc-Argent
33805e639b Implements hooks, an easier way to write code to be called at startup/roundstart/roundend. 
Current hooks are "startup", "roundstart", and "roundend".
Most stuff in world/New() has been moved over to the startup hook.
Roundstart and roundend have no hooks yet.

Removed the unused "newbanjob.dm" file and associated verbs/topics.
Bumped RECOMMENDED_VERSION up to 501.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-25 21:16:09 +00:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
Zuhayr
fa57b76f25 Merge pull request #3965 from jack-fractal/dev 
Mask of Nar'Sie - 1.0
 2013-11-24 20:57:04 -08:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
jack-fractal
39542c7760 - removing 'colon' use for proc calls. Generally a bad idea. 
- adding a check for being silenced to use runes
- adding extra slashes in front of the mask definition
- re-adding the autotransfer.dm file to the include list
 2013-11-24 16:13:28 -05:00