cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,236 Commits 61 Branches 14 Tags
bb190861bfdf7bfbbc1a681da79ccd1059196455
Commit Graph

506 Commits

Author SHA1 Message Date
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05: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
Remie Richards
b463c5a51f Merge pull request #5056 from Incoming5643/banthatshit 
Adds step_x and step_y to the locked var list
 2014-10-06 14:23:04 +01: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
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
Incoming
bfbaf1e3d4 Adds step_x and step_y to the locked var list. 
Touching either of these on ANYTHING breaks gliding for everything for the entire round.
There is no good reason to ever touch them!

#WhyWasntThisDoneYearsAgo
 2014-10-02 03:45:28 -04: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
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06: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
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
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
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
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
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
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
Alex
660a76e2a8 Merge pull request #4611 from Ikarrus/reportgrammar 
Minor grammar correction for Centcom report names
 2014-08-31 12:36:58 +01:00
ikarrus
f901a0e98a Additional Tweaks 2014-08-31 01:50:16 -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
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02: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
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
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
ikarrus
d56274a4ab Adds Deathsquad to Quick-Create Antagonist Menu 
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
 2014-08-16 00:40:37 -06:00
ikarrus
170c0e1b6b Removed Events from Admin Secrets menu. Trigger Event verb moved to Fun tab. 
-No more need to maintain a list of events to trigger
-No more needing to use debug-verbs to trigger all events
 2014-08-15 20:24:49 -06:00
ikarrus
51251a2449 Fixes #4220 (Select-Equipment > As Job... doesn't assign jobs to their ID and PDA) 
Fixes #4220
 2014-08-14 22:43:58 -06:00
Aranclanos
837428babd Merge pull request #4370 from hornygranny/badmins 
admins can't edit their rank's powers
 2014-08-09 17:02:28 -03:00
Hornygranny
c538030790 admins can't edit their rank's powers 2014-08-07 12:00:48 -07:00
paprka
d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace 
Conflicts:
	code/game/mecha/mecha.dm
 2014-08-06 15:22:56 -07:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures. 
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
 2014-07-27 19:14:40 +02:00
paprka
b35cee5334 Removes extra periods from ban reasons 2014-07-17 17:51:20 -07:00