cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,396 Commits 61 Branches 14 Tags
fae181be7c518dfd0b0396cce2d4afcff3cbbca7
Commit Graph

1045 Commits

Author SHA1 Message Date
Miauw
b5aa6acdc1 Makes surplus crates show up in the round end report. Fixed #5031. 2014-10-11 14:20:22 +02:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff 
Adds holographic janitor signs
 2014-10-10 17:41:41 +01:00
Remie Richards
be6c8c54d1 Reverts Antag selection happening before job selection 2014-10-09 22:57:19 +01:00
paprka
5457503c67 adds holographic janitor signs 2014-10-08 13:48:44 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix 
Fixing a lot of messages
 2014-10-07 12:09:01 -05:00
Cheridan
84934d7456 fixing conflicts manually 2014-10-06 19:40:20 -05: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
Cheridan
7e8e728d85 Merge pull request #4986 from Ikarrus/gangfixes 
Gang Mode fixes and improvements
 2014-09-29 10:33:17 -05:00
Cheridan
0f5fd59c0c Merge pull request #4919 from Miauw62/tatorbalance 
Rebalances traitor items.
 2014-09-27 17:13:50 -05:00
ikarrus
131b5ee0ec - Removes the useless has_been_rev var 
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
 2014-09-26 21:37:07 -06:00
ikarrus
65e38bdfbc Gang Mode fixes and improvements 
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
 2014-09-26 19:27:13 -06:00
Remie Richards
1fd6f72f8e Merge pull request #4923 from Menshin/active_diseases_cleaning 
active_diseases list cleans up on disease cure
 2014-09-23 22:54:57 +01:00
Miauw
206480744a brings emag back down to 6 tc 2014-09-23 20:05:12 +02: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
Aranclanos
95b9754f01 Merge pull request #4507 from RemieRichards/AntagBeforeJobs 
Antag selection before Job selection
 2014-09-23 08:13:39 -03:00
Miauw
be939d4bc1 Adds Syndicate surplus crates, containing 50 TC of random items. 2014-09-22 20:16:59 +02:00
Miauw
619b7beede Syndie bundle adjustments. Made the emag one TC more expensive. 2014-09-22 18:37:27 +02:00
ikarrus
eabe1f4491 Resolved conflicts and addressed maintainer feedback. 2014-09-21 15:30:54 -06:00
Menshin
fbfc9c1cbb Makes the global active_diseases list clean up when a disease is cured. 2014-09-21 21:07:45 +02:00
Miauw
899d967953 Doubles the amount of TC and the prices of uplink items. 
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
 2014-09-21 15:56:24 +02:00
Jordie0608
facb2744cb Standardizes name and path of plastique/plastic explosive/c4 to C4 2014-09-21 17:34:26 +10:00
Cheridan
e044df744d Merge pull request #4862 from phil235/VirusFix 
Fix virus detectability for medbot and medical HUD
 2014-09-19 14:54:30 -05:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
Cheridan
8bb2180dde Merge pull request #4855 from Aranclanos/seriouslyitwasthisieasy 
Supply datums roundstart mass-deletion fix.
 2014-09-17 19:03:02 -05:00
Remie Richards
7c96b0aa95 Merge branch 'master' of https://github.com/tgstation/-tg-station into TraitorBeforeJobs 
Conflicts:
	code/datums/mind.dm
	code/game/jobs/job_controller.dm
 2014-09-17 23:11:39 +01:00
phil235
1b0413fe51 Changing the severity of some diseases. 2014-09-16 19:20:05 +02:00
phil235
a6a3e1c008 * Medbots will stop detecting viruses undetectable to Health Analyzers or Pandemic machines. 
* Medbots will stop considering 100% harmless(beneficial or neutral symptoms) viruses as a disease to cure.
* gives a severity to all standard diseases.
* gives a severity var to symptoms.
* Players with only harmless (beneficial or neutral) viruses don't appear as ill on medical HUD.

Fixes the virus issue.
 2014-09-16 19:06:11 +02:00
Aranclanos
84bb478764 Supply datums will now use initial() to get the name of the items in their contents, instead of creating and deleting the objects before roundstart. 2014-09-16 03:27:14 -03:00
ikarrus
8f82644d0f All Nuke Ops are told the code when spawned 
So they don't have to rely on some sheet of paper.
 2014-09-15 09:18:12 -06:00
Alex
538641adb6 Merge pull request #4728 from Perakp/emaggedDoor 
Emags don't affect unpowered doors
 2014-09-11 19:54:02 +01:00
Cheridan
88471ff0d6 Merge pull request #4622 from Ikarrus/hivemindpaygate 
Hivemind Communication (:g) must be purchased before use
 2014-09-10 07:09:55 -05:00
ikarrus
f0c2cfee5e Bundled hivemind DNA exchanging 2014-09-09 09:37:28 -06:00
Cheridan
89aebe05b9 Merge pull request #4699 from Ikarrus/sscargo 
Adds Space Suit Crate to cargo
 2014-09-08 06:58:28 -05:00
Cheridan
cd34be6151 Merge pull request #4521 from Incoming5643/summonevents 
Magic Mania $1.75: Summon events
 2014-09-07 22:34:26 -05:00
Cheridan
866dbb7959 Merge pull request #4634 from Carn/timSort 
TimSort for byond
 2014-09-07 19:52:02 -05:00
Cheridan
6bde58d70d Merge pull request #4702 from Miauw62/sleepen 
Balance changes to the sleepy pen.
 2014-09-07 10:38:00 -05:00
Perakp
77ec6cbe29 Emags and ninja blades don't affect unpowered doors. 
Combines checks to one hasPower() proc.
 2014-09-07 18:34:34 +03:00
Alex
b7aad470a0 Merge pull request #4705 from Ikarrus/humanmasterrace 
Config Option to Bar Lizards from Authority Roles
 2014-09-07 15:02:45 +01:00
Alex
9d2e1ffafd Merge pull request #4630 from Ikarrus/nukeopsetup 
Nuke Ops Update
 2014-09-06 19:10:38 +01:00
ikarrus
33467c8a06 clarification in comments 2014-09-05 22:58:58 -06:00
ikarrus
bae6578055 Config Option to Bar Lizards from Authority Roles 
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
 2014-09-05 22:44:05 -06:00
Miauw
7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Ikarrus
84ae64f61c Update supplypacks.dm 2014-09-04 22:59:37 -06:00
ikarrus
a2535e07dc Adds high-end Syndicate crate to cargo 
A high-end crate for traitors. Siphon funds to the Syndicate and they will sneak a reward for you with the next shipment.

Gives you a random syndicate bundle for 140 points.
 2014-09-04 22:56:29 -06:00
ikarrus
443737d163 Adds Space Suit Crate to cargo. 
A single space suit for the cost of 80 points.
Requires EVA access.
 2014-09-04 22:29:03 -06:00
Alex
a0bf1cb7f4 Merge pull request #4621 from Ikarrus/bombsto6 
Increases Syndicate Bomb cost to 6TC
 2014-09-02 16:39:52 +01:00
Cheridan
ed9ef3c3e3 Merge pull request #4583 from JStheguy/master 
NT Poster Port
 2014-09-01 17:49:44 -05:00
JStheguy
1d21fb5d20 Mail Order Corporate Posters 
Whoops forgot about this bit.
 2014-09-01 17:44:39 -05:00