cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,122 Commits 8 Branches 26 Tags
8fc4e4e7db36884d288bd09007672925c465b2ea
Commit Graph

3190 Commits

Author SHA1 Message Date
Ccomp5950
942ce6ebc7 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-02-11 18:07:19 -06:00
Ccomp5950
8ae8949b10 NanoUI PDA - Decreasing initial size of the screen. 
Gonna miss my XBOX-LARGE pda screen.
 2014-02-11 00:56:42 -06:00
Ccomp5950
5810970352 Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-10 20:42:32 -06:00
Segrain
8e11dabf96 Bloody feet. 2014-02-09 13:30:28 +03:00
Segrain
b4a8c370ba Colouring before updating. 2014-02-09 13:21:18 +03:00
Segrain
be61c65edd Proper indentation. 2014-02-09 13:12:49 +03:00
Loganbacca
4b1bb13ace Crate and closet updates 
- Added atmos themed sprite for atmospheric technician secure closets
- Added a second radiation suit to radiation suit closets
- Added a solar pack crate (because adding crates to the map with this many objects manually is silly)
 2014-02-08 18:35:13 +13:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2 
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.
 2014-02-06 23:07:35 -08:00
Segrain
cec9b87289 Folder recipes. 2014-02-03 04:45:42 +03:00
RavingManiac
30915b5ba4 Escape shuttle modified after feedback. 
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
 2014-02-02 16:04:11 +08:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
Ccomp5950
f136fa1db2 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/mask.dmi
 2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/supermatter/supermatter.dm
	maps/tgstation2.dmm
 2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d Merge pull request #4358 from SueTheCake/armors 
Tactical Armor Storage + Tac Armor REDUX
 2014-01-30 10:33:46 -08:00
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
 2014-01-30 12:14:44 -06:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Zuhayr
c0b91504b4 Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR. 2014-01-28 15:59:50 +10:30
Zuhayr
5d02779d16 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-27 20:55:15 +10:30
Chinsky
ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color 
Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi
 2014-01-27 02:27:27 +04:00
Zuhayr
84b3512261 Merge pull request #4345 from RKF45/misc 
Fixes for my earliest commits
 2014-01-26 09:16:07 -08:00
Zuhayr
1fce280da8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-26 20:07:02 +10:30
RKF45
4ca429fdf3 Actually allowing tiny objects on ears 2014-01-25 13:06:22 +01:00
Kilakk
44962760b8 Removed pointless output 
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
 2014-01-24 15:04:41 -05:00
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
Kilakk
1a7616fb35 Fixes #4322 
* There's probably a much more "modular" way of doing this, but, eh
 2014-01-23 20:53:05 -05:00
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Chinsky
3b26dab954 Merge pull request #4309 from LBraindead/dev 
AMEN
 2014-01-19 21:25:19 -08:00
Chinsky
5a8eb3c455 Merge pull request #4318 from Loganbacca/engineroom 
Engine Room Redesign
 2014-01-19 21:22:45 -08:00
Loganbacca
24c6063a07 Updated Supermatter user manual sprite 2014-01-20 01:57:58 +13:00
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color. 
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
 2014-01-19 03:02:58 +04:00
RKF45
5649bb7fe2 Various tiny improvements 2014-01-18 22:15:46 +01:00
LBraindead
bbe01a80e6 Update explosion.dm 
transfer explosions accross z-levels
 2014-01-18 00:33:41 +01:00
LBraindead
9d618b2a11 Update lattice.dm 
allow lattices to exist on open space
 2014-01-18 00:16:14 +01:00
Ccomp5950
8a179a8ff1 Merge pull request #4299 from Faerdan/dev 
Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 15:21:47 -08:00
Ccomp5950
dd7fef9dc2 Merge pull request #4277 from RKF45/paint 
BS12 posters
 2014-01-15 14:02:47 -08:00
RKF45
30f2d49f01 Quotes inside strings confuse and scare me. 2014-01-15 22:45:10 +01:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Mark Aherne (Faerdan)
024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 01:08:45 +00:00
RKF45
5083e1cd47 Requested adjustments 2014-01-13 22:54:47 +01:00
RKF45
0a4a7c7c08 Merge remote-tracking branch 'upstream/dev' into paintmixing 2014-01-13 22:15:33 +01:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Mloc
c46d872e6c Merge remote-tracking branch 'upstream/master' into dev 2014-01-12 19:46:31 +00:00
RKF45
b9c747aeaf Makes mixing paints actually make sense 2014-01-12 12:04:18 +01:00
Rob Nelson
56e4b11ec5 Dynamic loading of posters 
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
 2014-01-11 18:10:31 -08:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00