cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-06 22:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,650 Commits 63 Branches 14 Tags
22ab7d6a4fe6b19e0d94de8076a13521c2c75a74
Commit Graph

1972 Commits

Author SHA1 Message Date
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-09-25 18:45:53 +02:00
phil235
7afbd3345b Replacing some hearers(...) with get_hearers_in_view(...). 
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
 2014-09-25 18:22:27 +02:00
Swag McYolosteinen
9409ab2b65 Merge pull request #4932 from Ikarrus/tdomereset 
[MAP] Adds a reset button for the Thunderdome
 2014-09-24 17:14:51 +02:00
Ikarrus
0df3819664 logs will show if mobs have been deleted 2014-09-24 09:05:24 -06:00
Cheridan
ff5ec967eb Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives 
Standardizes name and path of plastique/plastic explosive/c4 to C4
 2014-09-23 09:02:43 -05:00
Swag McYolosteinen
9fc6fccf17 Merge pull request #4616 from Ikarrus/revvsrev 
Gang Mode for TG
 2014-09-22 20:28:47 +02:00
ikarrus
21e05774e4 Adds a reset button for the Thunderdome 
You have the option of deleting mobs or leaving them alone.

Requested by @Hornygranny
 2014-09-21 20:37:29 -06:00
ikarrus
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
MrStonedOne
6c0c3d3df8 Removed database specifications since this is handled by connecting to a database context. 
This should fix some runtimes only downstream server providers were getting because their database isn't named test (default is feedback
 2014-09-21 05:26:58 -07:00
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Miauw
e66f74439a Fixes radio MMIs turning exofabs into radios. 
Also removed the obsolete GLOBAL_RADIO_TYPE variable.
 2014-09-20 15:19:29 +02:00
MrStonedOne
e21ed011af Fixes some erros in the database system 
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
 2014-09-19 13:37:58 -07:00
Aranclanos
fb15795f2b Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" 2014-09-19 13:38:10 -03:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Remie Richards
49bf678e7f Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn 
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
 2014-09-19 16:00:29 +01:00
Cheridan
de6edfc1c6 Merge pull request #4818 from Incoming5643/summoneventfixerspecial 
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
 2014-09-16 09:09:40 -05:00
Alex
6a083ecda0 Merge pull request #4835 from Aranclanos/Entered 
Entered() cleanup
 2014-09-16 12:12:04 +01:00
Aranclanos
53f48fa599 Cleaned up the turf Entered() procs: 
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
 2014-09-15 03:26:58 -03:00
phil235
8d6ee69a36 Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete). 2014-09-14 16:17:16 +02:00
Alex
1431e64477 Merge pull request #4781 from Jordie0608/niknaksaystickymayhemisnotprofessionalyethetalksaboutpooping 
Removes log_adminwarn
 2014-09-14 13:14:22 +01:00
Incoming
a8737f8ae4 Stops the exponential hell of petsplosion happening more than once a round it turns out we didn't need 6000 mice 
Reduces the lava event from "lets slay all idlers and stop all action for 2 minutes" to "lets greviously wound all idlers and stop all action for 30 seconds"

Makes summon magic/summon guns work fine without a mob attached, this prevents a runtime and some odd messages to the admins

Makes the inviciblity text jive better.
 2014-09-14 03:36:38 -04:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)" 
fixing typos and missing emotes in emote lists.
 2014-09-14 01:15:15 +02:00
ikarrus
9b8322c19d Shuttle Call/Recall Tracing in Announcements 
- Emergency  shuttle call/recall announcements will say when a tracing attempt has been successful, as well as explicitly telling players how to view them
- Clarified language further on how emergency shuttle tracing is done
- Increased tracing success rate from 60% to 70%
- Removed a lot of duplicated code by moving all the priority_announce() calls to incall()
 2014-09-13 12:50:38 -06:00
Aranclanos
042615709d New path for energy swords, /obj/item/weapon/melee/energy/sword/saber and the different type of colours (purple, red, green, blue) are childrens of it. 
You can only use sabers to create a dualsword and to archieve the funky colours with the multitool.
Dualswords now will be eqipped on hand once created instead of staying on the floor.
Fixes issue #4050
 2014-09-12 20:25:40 -03:00
Jordie0608
a1de281338 Removes log_adminwarn 2014-09-11 17:35:28 +10:00
Jordie0608
272787615d Makes show attack log only ask once 2014-09-11 11:39:07 +10:00
Alex
9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup 
Nuke Ops Update
 2014-09-06 19:10:38 +01:00
Alex
5e367a0e37 Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos 
Logging to add/remove memo
 2014-09-06 19:07:54 +01:00
Alex
53e7981a98 Merge pull request #4698 from Ikarrus/roundendreportbugs 
Fixes Round-End report bugs
 2014-09-06 19:04:27 +01:00
ikarrus
c22a44d676 Fixes Round-End report bugs 
- Fixes #4664 New Players won't get the "you did not survive" message
- Shift duration minutes will never neve have more than 2 digits (Same thing has been done for the Round Duration timer in Check-Antags Menu)
 2014-09-04 21:05:07 -06:00
Firecage
cee3e7e7b7 fix3 2014-09-04 16:18:38 +02:00
Firecage
0b129fb646 fix2 2014-09-04 16:00:45 +02:00
ikarrus
dbf7392649 Every time we would have pulled a random ghost into a mob, we will poll the ghosts for volunteers first. 2014-09-03 23:36:23 -06:00
Firecage
6d259e10ec Spanclass fixes 2014-09-03 20:00:35 +02:00
Jordie0608
a72b0dddad Made this actually work 2014-09-01 22:27:03 +10:00
Jordie
b3e7e25631 Logging to add/remove memo 2014-09-01 20:39:12 +10:00
ikarrus
3e4378f75f - A leader will always be chosen 
- Nuke ops will all stop spawning on the same spawn location (TC management console)
 2014-08-31 21:27:32 -06:00
ikarrus
908cac5ac0 Quick-Create Nuke Ops Actually Working 
- A nuke will actually spawn with them
- The armory closet (pinpointers, etc) will actually spawn
- Cleaned up code
 2014-08-31 19:27:41 -06:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say() 
[READY] Saycode rewrite
 2014-08-31 10:59:04 -05:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
Alex
660a76e2a8 Merge pull request #4611 from Ikarrus/reportgrammar 
Minor grammar correction for Centcom report names
 2014-08-31 12:36:58 +01:00
Alex
a931f00608 Merge pull request #4563 from Ikarrus/allspecies 
Secret Button to set everyone's mutant race
 2014-08-31 12:32:02 +01:00
ikarrus
5aa62a83bb Gang name will be randomized outside of Gang Mode. 2014-08-31 02:55:18 -06:00
ikarrus
f901a0e98a Additional Tweaks 2014-08-31 01:50:16 -06:00
ikarrus
51a333ebe7 Merge gang mode into latest version 2014-08-30 23:31:44 -06:00
ikarrus
4c801434a8 Gang Mode 2014-08-30 23:17:14 -06:00
Alex
679e0bda52 Merge pull request #4524 from Ikarrus/eventsprompter 
Trigger Events verb will now ask if the admin wants to announce to the crew
 2014-08-30 20:12:46 +01:00
ikarrus
2f65498aa7 Minor grammar correction for Centcom report names 2014-08-30 11:18:19 -06:00
Miauw
98d567dde7 more say bugfixes 2014-08-29 14:40:51 +02:00
ikarrus
1cfdde31f3 -Trigger Event is now its own panel 
-The prompt to alert the crew now includes a cancel button
-Holiday Events are now marked more clearly in the menu
 2014-08-28 22:08:14 -06:00