cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,777 Commits 61 Branches 14 Tags
ab35cd2b2caa830db0dcc1e35db436c254762742
Commit Graph

903 Commits

Author SHA1 Message Date
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
Aranclanos
fb15795f2b Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them" 2014-09-19 13:38:10 -03: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
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
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
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
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
Miauw
bc2b8d0d5d DONE DONE DONE DONE DONE DONE 2014-08-27 17:40:26 +02:00
ikarrus
828d1627a3 code optimization 2014-08-26 10:51:20 -06:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
ikarrus
eac854ec97 Secret Button to set everyone's mutant race 
Mostly as a way to reverse the consequence of an badmin's lapse of good judgement (There's no easy way to reverse the Halloween event button.). This can also be used for an assortment of badminning.
 2014-08-24 15:52:53 -06:00
Alex
6e35d0cd7f Merge pull request #4554 from Ikarrus/deathsquadnames 
Deathsquad names will pull from the deathsquad name list
 2014-08-24 13:08:45 +01:00
Alex
f061c0d9d3 Merge pull request #4418 from Ikarrus/minorannouncements 
Minor Announcements
 2014-08-24 13:06:31 +01:00
ikarrus
cba3fa364f Reducing dup code 2014-08-23 21:43:48 -06:00
ikarrus
5413812958 Deathsquad names will pull from the deathsquad name list 
I didn't know they were a thing. But now they are, once again!
 2014-08-23 21:41:49 -06:00
ikarrus
ba45abdf25 Admins changing shuttle time will use minor_announce instead of priority_announce 2014-08-23 20:22:47 -06:00
ikarrus
951c8bddef Resolve Conflicts: 
code/modules/admin/topic.dm
 2014-08-22 12:58:59 -06:00
ikarrus
9843dbc37d Trigger Events verb will now ask if the admin wants to announce to the crew 
Additionally,
-Create virus re-added to secrets menu, as it had options to specify a specific virus to create
-Blob added to One-Click-Antag with the option to set the strength of the blob (1=Weak, 2= Strong, 3=Full)
 2014-08-21 21:33:53 -06:00
ikarrus
0891744c8e Resolved Conflicts: 
_maps/map_files/tgstation.2.1.3.dmm
 2014-08-21 19:47:30 -06:00
Alex
01354b70f3 Merge pull request #4458 from Ikarrus/trigger_event 
Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab
 2014-08-21 13:28:16 +01:00
ikarrus
4271b6a859 Removing duplicate href code 2014-08-18 22:29:32 -06:00
Alex
7e25fe77e8 Merge pull request #4461 from Jordie0608/tbhtheentirefeatureiskindasilly 
Updates admin nicknames, moves list to txt file
 2014-08-18 08:25:05 +01:00
ikarrus
0de9402a18 Made receiving and printing centcom reports a proc 
Also changed a few "Cent. Com." strings to "Centcom"
 2014-08-17 13:03:11 -06:00
ikarrus
9d4d755174 Made deathsquads traitors to aid in tracking, admin tools, and end-round reporting 2014-08-16 10:50:52 -06:00
Jordie0608
ac1a479da8 Updates admin nicknames, moves list to txt file 2014-08-16 19:14:17 +10:00
Ikarrus
67a18271f2 Update one_click_antag.dm 2014-08-16 00:46:24 -06:00