cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,280 Commits 61 Branches 14 Tags
b9f4a54c56bc00a3b681dcdeb5414ec83f6281d7
Commit Graph

3076 Commits

Author SHA1 Message Date
hornygranny
c55480af16 Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay 
Stripping delay adjustments
 2014-10-09 13:46:59 -07:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs 
Adds zipties
 2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
hornygranny
02d8cf4115 Merge pull request #4994 from paprka/miningainteasy 
Mining rebalancing
 2014-10-08 14:44:35 -07:00
Remie Richards
e60dda5f0e Merge pull request #5106 from paprka/megacarps 
Ports megacarps!!!
 2014-10-08 22:16:22 +01:00
paprka
d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka
668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-08 07:17:42 -07:00
paprka
8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Lo6a4evskiy
98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
 2014-10-08 16:45:22 +04:00
Remie Richards
7892359207 Merge pull request #5114 from hornygranny/fatstacks 
can no longer stack resin structures
 2014-10-08 10:21:49 +01:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Cheridan
0d0ae75102 Merge pull request #5108 from paprka/fixrobogrammar 
Fixes grammar in robot.dm
 2014-10-07 09:14:41 -05:00
Lo6a4evskiy
01ae516481 Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
 2014-10-07 12:38:47 +04:00
paprka
0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00
Cheridan
66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
 2014-10-06 19:27:14 -05:00
Hornygranny
265069f2a7 did it properly 2014-10-06 11:07:07 -07:00
Hornygranny
185048bfd5 can no longer stack resin structures 2014-10-06 10:55:20 -07:00
Lo6a4evskiy
61937c8dae Changed strip delays for most clothes 2014-10-06 19:42:12 +04:00
Remie Richards
5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man 
Updates spiders to have full player functionality
 2014-10-06 14:24:39 +01:00
Remie Richards
acf5bee200 Merge pull request #5092 from Cheridan/flashing 
Flash Changes
 2014-10-06 14:10:31 +01:00
paprka
ed3385dbf3 pro-LGBT grammar 2014-10-06 02:54:12 -07:00
paprka
2f960c8d89 lol 2014-10-05 22:25:53 -07:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor 
Change examine() from an atom verb to a mob verb
 2014-10-05 23:37:34 -05:00
paprka
b9a10b5a82 removes qdel on death 2014-10-05 17:49:15 -07:00
Cheridan
df8dc6d119 Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing 2014-10-05 19:24:49 -05:00
paprka
f406371704 ports megacarps!!! 2014-10-05 16:19:19 -07:00
Lo6a4evskiy
10a3f27ffd Melee armor value increases time it takes to strip 2014-10-05 20:54:46 +04:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-10-05 13:48:11 +02:00
Cheridan
2a12b149e1 Merge pull request #4966 from JJRcop/whisper-dead-dead 
Fixes being able to whisper while dead
 2014-10-05 00:40:28 -05:00
Cheridan
e8a56ee14b Merge pull request #4949 from hornygranny/alienpockets 
alien pockets removed
 2014-10-04 23:53:06 -05:00
Cheridan
91cd4b2476 Final tweaks, map update. replaces cyborg's flash with their own subtype with the special effect. 2014-10-04 22:01:51 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc. 
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
 2014-10-05 01:29:30 +02:00
Cheridan
5c5fee201b Merge pull request #5060 from Perakp/simpleEmoteFix 
Fixes simple animal emote runtimes.
 2014-10-04 13:51:08 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Remie Richards
cd53199398 Merge pull request #5004 from Menshin/malf_timer_fixes 
Malf timer polishing/fixes
 2014-10-03 21:41:15 +01:00
Cheridan
9b7856e048 Merge pull request #5005 from Miauw62/wjfondlesxenos 
Makes xe- ALIENS hiss again when speaking.
 2014-10-02 22:01:18 -05:00
Perakp
83576edc4a - Fixes simple animal emotes from runtiming. 
- Fixes punctuation autism.!.!
 2014-10-02 23:03:41 +03:00
Incoming
8e99152226 Updates spiders to have full player functionality 
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)

I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
 2014-10-01 18:58:07 -04:00
Cheridan
088a2a2106 Merge pull request #5008 from Miauw62/EVERYTHINGBKEARPESK 
Simple animal emotes work again.
 2014-10-01 10:45:53 -05:00
Cheridan
6e44354f9d Merge pull request #4914 from RemieRichards/DroneImprove 
Drone Improvements - Take 2 PR Boogaloo
 2014-10-01 10:16:06 -05:00
Cheridan
fa751f2f72 Merge pull request #4975 from phil235/CloneMessages 
Replacing clone damage descriptions with "cellular damage".
 2014-09-30 12:21:42 -05:00
Remie Richards
219864312a Merge pull request #4988 from Miauw62/420 
Fixes a bunch of saycode things.
 2014-09-30 10:23:23 +01:00
Cheridan
094010444f Merge pull request #4970 from Jordie0608/nothingwittyhere 
Fixes 'atoms' typo in unsuitable_atmos_damage
 2014-09-29 12:57:08 -05:00
Miauw
376715271b emote code sucks 2014-09-29 18:58:24 +02:00
ikarrus
fdecf7bb68 Ghosts will be able to hear all Special Chats 
Mostly so admins can supervise them.

- Ghosts will be able to hear Cultist Chat. Ghosts weren't able to pick up ones sent by cult_innate_comm()
- You won't need ghost ears on to listen to Binary Chat, like how it used to be
- put dead_mob_list to good use (Everything seemed fine when I tested it. Let me know if I'm missing overlooking something)
- Bumped lingchat sense chance up to 40%

Resolves #4860
 2014-09-28 20:35:09 -06:00
Miauw
127bab5337 Simple animal emotes work again. Fixed #4963 2014-09-28 20:49:14 +02:00
Miauw
ade0a90897 Makes xe- ALIENS hiss again when speaking. Fixed #4967 2014-09-28 19:29:47 +02:00
Menshin
ed807f8538 * Polished the malf timer logic 
* added a protection to prevent division by 0 when all hacked apcs are destroyed
* added a midnight rollover check for the MC (fixes #4905)
* toggling breakers won't add/remove a hacked APC from the AI apcs pool anymore
 2014-09-28 12:16:21 +02:00
paprka
4fbe9730f6 Mining rebalancing 2014-09-27 17:04:56 -07:00