cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,047 Commits 8 Branches 26 Tags
3ab805f7c95fbadcf65dccf95abc30331bc31a0a
Commit Graph

3551 Commits

Author SHA1 Message Date
Segrain
4fe85651b6 Taperolls for cyborgs. 2014-02-03 04:46:47 +03:00
Segrain
fcc4560e92 Displaying delayed time. 2014-02-03 04:38:38 +03:00
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs 
Character setup underwear rendering
 2014-02-01 14:58:38 -08:00
Chinsky
3a913e426c Merge pull request #4360 from RKF45/dev 
I am doing that just for genetecists wearing monkey suits.
 2014-02-01 03:33:54 -08:00
Chinsky
79fd66c685 Merge pull request #4364 from Loganbacca/collars 
Suit collars
 2014-02-01 03:30:36 -08:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm
 2014-02-01 17:53:13 +13:00
Loganbacca
44498dc5eb Tail rendering fix 
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
 2014-02-01 13:30:18 +13:00
Loganbacca
c6964b1a1a Cleaned collar rendering code 
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define
 2014-02-01 13:25:09 +13:00
Ccomp5950
e72c824b90 Deadchat sanitized so players can't use HTML. 2014-01-31 16:41:12 -06:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze 
0.1.8 Staging [Do not merge]
 2014-01-31 12:40:15 -08:00
Segrain
ece3556143 Smallfix. 2014-01-31 16:31:17 +03:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Segrain
93a29c60b3 Verb category. 2014-01-31 16:22:31 +03:00
Loganbacca
41dccddbef Suit collars 
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm

Trenchcoats are go!
 2014-02-01 02:17:52 +13:00
Ccomp5950
8c5c5fb868 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-31 06:26:20 -06:00
RKF45
2be33b8713 Typo 2014-01-31 08:36:56 +01:00
Segrain
b9b6a6d5be Check for verb removal. 2014-01-31 00:31:41 +03:00
RKF45
003dd117f2 New preferences 2014-01-30 22:27:47 +01:00
Ccomp5950
f208f05534 Merge pull request #4356 from Loganbacca/bayfix-devfreeze 
Non-standard dropped item layer bug
 2014-01-30 10:59:38 -08: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
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
Ccomp5950
9f0792ac1a Merge pull request #4352 from Zuhayr/dev 
Species changes and icons.
 2014-01-30 09:37:15 -08:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
b38e1a71be Fixes #4223 2014-01-30 22:06:57 +10:30
Zuhayr
bc48240fff Generalized yank_out_object(). 2014-01-30 21:56:33 +10:30
Loganbacca
cbd73c9845 Fix item drop layer bug 
Similar to the handcuff resisting layer bug.

When removing an item from your inventory that has associated inventory slots, items that were dropped from the extra inventory slots would be dropped with incorrect layer variables (set to 20 so they were rendered over the UI).
Now when the extra items are dropped, it calls the drop_from_inventory() proc, which correctly changes their layer back.
 2014-01-30 23:42:21 +13:00
Loganbacca
48e4b9a698 Fix handcuff resist - layer bug 
Fixes #4324

Resisting out of handcuffs was leaving the handcuffs layer set to 20 (over top of the UI).
Changed it to use the drop_from_inventory() proc so it handles the drop event correctly.
 2014-01-30 21:35:38 +13:00
Zuhayr
a2fa476182 Compile fix. 2014-01-29 16:41:59 +10:30
Zuhayr
2703333312 IPC tweaks. 2014-01-29 16:05:43 +10:30
Zuhayr
4a0fb22530 IPC brain surgery code. 2014-01-29 16:01:25 +10:30
Zuhayr
f3d0efea87 IPC feeding from APCs, IPC lack of reagent processing. 2014-01-29 15:37:08 +10:30
Zuhayr
66173043b1 Actually applied nymph speech and name change. 2014-01-29 04:35:44 +10:30
Zuhayr
9301c72933 Fixing case on some del() calls. 2014-01-29 04:31:38 +10:30
Furlucis
0f8b1b09ab Small borer fix 
Someone forgot an exclamation point and made the check for a lack of
brain check FOR a brain, making the assume direct control thing not
work.
 2014-01-28 00:32:39 -05: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
ae7ae5a837 IPC hairstyles. 2014-01-28 15:58:26 +10:30
Ccomp5950
16904ec5ec Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-24 20:38:09 -06:00
Chinsky
6da9f68a7a Merge pull request #4329 from Ccomp5950/gun_fixes 
Sniper Rifle fixes
 2014-01-23 09:07:53 -08: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
Ccomp5950
b260d511fb Gun fixes. 
You die, you are zoomed out

You have welding equipment on, you can't zoom in.
 2014-01-22 23:40:32 -06:00
Ccomp5950
fbcf162416 Sniper Rifle fix. 
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.
 2014-01-22 22:40:21 -06:00
DJSnapshot
e76838bd6e fix for muting deadme as well. 2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9 Admin requested addition of a global dsay toggle. 2014-01-20 18:27:12 -08:00
RKF45
5a9e8e0f30 Fixes for emagging robots 2014-01-19 12:16:10 +01:00
Ccomp5950
78c032b317 AntagHUD restrictions, disallow players becoming mice. 
If antagHUD respawn restrictions are enabled, players will no longer be able
to use the "become mouse" verb if they have enabled their antagHUD's.

Observers were able to use antagHUD then become mice and die resetting their "has_used_antagHUD" variable allowing them to respawn bypassing the restrictions by becoming a mouse as well as respawning later.
 2014-01-15 03:25:13 -06:00
Mloc
57a83eae70 Fix for #4194 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-13 14:27:44 +00:00
Mloc
e25c60f930 Fix for #4289 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-12 23:23:04 +00:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00