cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,910 Commits 8 Branches 0 Tags
9665e8c4df1069f8d3d67b3485f21f23164105e3
Commit Graph

6779 Commits

Author SHA1 Message Date
Ccomp5950
9665e8c4df Mouse Attack_Logs disabled. Admins rejoice. 
No more mice in disposals spamming the hell out of admins everytime someone flushes items.
 2014-02-05 00:14:45 -06:00
Iamgoofball
2ec805630e Because we HAVE to define Del() three times 
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
 2014-02-04 11:30:35 -08:00
Chinsky
e7c22c28c7 Merge pull request #4379 from Segrain/master 
Smallfix.
 2014-02-04 01:44:32 -08:00
Chinsky
9a4bcc60b4 Merge pull request #4377 from Ccomp5950/ai_announcements_tease 
Commented out the AI Announcement verbs
 2014-02-02 23:30:55 -08:00
Segrain
83246df6d5 Fix for #4297. 2014-02-03 07:32:53 +03:00
Ccomp5950
3a54d96b7a Merge pull request #4374 from Loganbacca/bayfix 
Broken heart fix
 2014-02-02 17:22:25 -08:00
Ccomp5950
35f534854a Commented out the AI Announcement verbs 
Now the AI won't get it's hopes up that it can have the
CAPTAIN REPORT TO THE BAR FOR JOHNSON INSPECTION
 2014-02-02 16:57:07 -06:00
Loganbacca
70a1c768ad Broken heart fix 
Code was using a switch with variables in it. This doesn't work.
Replaced it with an if..else sequence.

Thanks to the guys from Paradise for finding this.

Note: this only fixes literal heart problems, it won't do anything for relationship issues.
 2014-02-03 00:28:15 +13:00
Ccomp5950
d38af0c44b Typo fix: corpotate -> corporate. 
And superfluous U removal 'MURIKA!
 2014-02-01 15:25:00 -06: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
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
2f36fb79bc Fixes #4078 2014-01-30 23:31:50 +10:30
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
Zuhayr
eed21f3f5b Fixes #4355 2014-01-30 21:27:44 +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
Ccomp5950
a3befe9936 Private message fixes. Stealth-mode / admin != maroon 
Stealth-Mode Admins won't have their keys show up in the title of private messages anymore (unless the person sending the message is mod+)

Admins PM's to players will show up as red again.  You are welcome Virgie!
 2014-01-25 22:16:58 -06:00
Chinsky
6da9f68a7a Merge pull request #4329 from Ccomp5950/gun_fixes 
Sniper Rifle fixes
 2014-01-23 09:07:53 -08:00
Ccomp5950
8ae4e41aaa Derp merge deconflict error I made when merging master into dev-freeze. 2014-01-23 01:36:32 -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
2d25c94900 Sniper Rifle Zoom proc documentation comments. 2014-01-22 23:46:05 -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
Ccomp5950
84eefc3b31 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes 2014-01-22 22:39:16 -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
0870844898 SMES fix, AI's can now use them. 
Thinking this was a typo, though quite honestly I'm not sure why this test
is even here as distance checks are built into nanoUI but since feradan put it in
I'm kinda not wanting to remove it.
 2014-01-19 21:26:15 -06:00
Loganbacca
7f89f602b2 Fixed rad collector toxin drain bug 
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
 2014-01-20 16:16:02 +13:00
DJSnapshot
04b47fa6a0 Merge pull request #4302 from Ccomp5950/mouse_antagHUD 
AntagHUD restrictions, disallow players becoming mice.
 2014-01-15 22:23:38 -08:00
Ccomp5950
90ce5b2b69 SPACE2TAB modules/projectiles/guns/energy/special.dm 
No changes other then space2tab is done in this commit.
 2014-01-15 23:42:55 -06:00
Ccomp5950
039d2d75bf Merge pull request #4288 from BcTpe4HbIu/master 
Fix for broken on spawn chem_dispenser
 2014-01-15 20:44:57 -08:00
Ccomp5950
775d75d2f4 Merge pull request #4301 from Loganbacca/bayfix-master 
Multiple typo and bug fixes
 2014-01-15 14:04:10 -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
Loganbacca
5827e5a022 Fixes #4296 2014-01-14 15:59:58 +13: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
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Igor Golubkov
a0b909926b Fix for broken on spawn chem_dispenser 
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.

Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org>
 2014-01-13 00:25:45 +04:00
Ccomp5950
dc7e32a646 Merge pull request #4271 from Loganbacca/master 
Plasma glass stacking fix
 2014-01-11 19:39:22 -08:00
Ccomp5950
dfe96b3702 Merge pull request #4260 from Zuhayr/sandwiches 
Sandwiches!
 2014-01-11 19:15:56 -08:00
Chinsky
7a80f02670 Merge pull request #4278 from Faerdan/dev 
SMES NanoUI
 2014-01-11 19:04:18 -08:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00