cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 5 Branches 0 Tags
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

3523 Commits

Author SHA1 Message Date
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
Segrain
b9b6a6d5be Check for verb removal. 2014-01-31 00:31:41 +03: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
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
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
Chinsky
6da9f68a7a Merge pull request #4329 from Ccomp5950/gun_fixes 
Sniper Rifle fixes
 2014-01-23 09:07:53 -08: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
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
Zuhayr
adaccb3c3e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-11 10:45:57 +10:30
Ccomp5950
bc6561b9e4 Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. 
Who does that?  People that cause runtimes, that's who!

(Jerks)
 2014-01-10 15:59:40 -06:00
Mloc
6f01e97161 Merge pull request #4248 from Zuhayr/dev 
Dionaea changes (microwave recipe, holder procs) and resist verb.
 2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Zuhayr
906768070f Resolved custom_items.dmi. 2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
LightningIron
8c26c23157 Merge remote-tracking branch 'upstream/master' 2014-01-09 11:15:26 -06:00
Zuhayr
d3d6294ab0 Compile fix, ugh. 2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286 Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob. 2014-01-10 01:58:22 +10:30
Zuhayr
35d8219bb6 Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine. 2014-01-09 23:57:20 +10:30
Zuhayr
943554242a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-09 23:53:34 +10:30
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
ZomgPonies
09c56a0930 BS12 compile fixes for Constructs 2014-01-09 04:49:16 -05:00
ZomgPonies
b4f401e3b6 Constructs missing all their abilities -- Taken from /tg/ 
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
 2014-01-09 04:40:37 -05:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143
 2014-01-08 22:15:47 -07:00
LightningIron
8ae2266526 Added captured variable to mobs, non-chair equivalent to being buckled into a chair 2014-01-08 20:49:45 -06:00
Chinsky
3259ccf86f Merge pull request #4217 from DJSnapshot/dev 
Custom stuffs!
 2014-01-08 17:22:29 -08:00
Giacomand
dfdeed7434 Made the follow verb less buggy. 
Removed duplicated code.
 2014-01-08 19:14:15 +00:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
YotaXP
68ae21fac3 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm
 2014-01-08 11:41:51 +00:00