cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,312 Commits 61 Branches 14 Tags
8286e70c20024d92d97c51bc34eef8b95d427310
Commit Graph

10726 Commits

Author SHA1 Message Date
quiltyquilty
8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
quiltyquilty
4c079bf65b more epic fixing 2014-09-02 17:26:39 -05: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
Miauw
2c9e5b69da Fixes a radio runtime. 2014-09-01 14:14:35 +02:00
Alex
4e7c2cbb8e Merge pull request #4623 from phil235/WaterLightFix 
Fix low water light on hydrotray
 2014-08-31 20:55:41 +01:00
phil235
f4c38c6b86 Fix low water light on hydrotray 
one single space...
 2014-08-31 21:53:26 +02:00
Cheridan
e0d171e7bf Merge pull request #4483 from ChuckTheSheep/direct-intent 
Direct intent clicking (redo)
 2014-08-31 11:25:47 -05:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints 
Fingerprints for Cables and Tables
 2014-08-31 17:11:14 +01:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say() 
[READY] Saycode rewrite
 2014-08-31 10:59:04 -05:00
Miauw
dc5ba247b2 blblb 2014-08-31 15:10:32 +02:00
Miauw
6176d845f0 fixes some stuff gia told me to fix 2014-08-31 14:27:40 +02:00
Tokiko1
4ef3beb454 Testing 2014-08-31 14:25:32 +02:00
Tokiko1
ba20a875a0 Should fix merge conflicts 2014-08-31 14:22:56 +02: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
c788df4d6e Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish 
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
 2014-08-31 12:34:34 +01:00
Alex
2c19d113bd Merge pull request #4580 from Firecage/changelingpanaceatext 
This fixes the description that Anatomic Panacea gives.
 2014-08-31 12:34:01 +01:00
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints 
Shower logging and prints
 2014-08-31 12:32:31 +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
0cb906cc62 Merge pull request #4606 from Ikarrus/detailedendreport 
More Detailed End-Round Report
 2014-08-31 12:29:43 +01:00
Alex
15c6e99801 Merge pull request #4607 from Ikarrus/removelobbymeta 
Only Admins can see Ready Players in Lobby
 2014-08-31 12:29:16 +01:00
ikarrus
df4125d2d6 Approval Rating will now only consider living carbon mobs with associated keys.... All those soulless monkeys and slimes don't count!!! 2014-08-31 02:18:02 -06:00
Cheridan
9a335b7855 Merge pull request #4549 from Ikarrus/tinyprickironicsmiley 
Adds a couple of new hallucination effects :^)
 2014-08-30 16:51:09 -05:00
Cheridan
f209d4ba52 Merge pull request #4601 from Ikarrus/removeholidaycheer 
Holiday Events no longer fire false alarms
 2014-08-30 16:41:23 -05:00
Alex
ca731cfeda Merge pull request #4610 from Ikarrus/blobreporttweaks 
Tweaks to Blob Mode Command Reports
 2014-08-30 20:14:24 +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
Alex
61c6168975 Merge pull request #4598 from joonoro/master 
fixed reinforced tables
 2014-08-30 20:05:01 +01:00
Alex
ed0305cf6b Merge pull request #4589 from Menshin/wand_fix 
Fix wands losing a charge even when no spell was actually cast
 2014-08-30 20:03:03 +01:00
Alex
14b03b5db5 Merge pull request #4569 from quiltyquilty/hairs 
organizes various hairstyles
 2014-08-30 20:01:55 +01:00
Alex
8fcbc3b69b Merge pull request #4558 from Ikarrus/ttvpack 
Tank Transfer Valves made orderable from cargo
 2014-08-30 20:01:05 +01:00
ikarrus
2f65498aa7 Minor grammar correction for Centcom report names 2014-08-30 11:18:19 -06:00
ikarrus
61ec54850f Tweaks to Blob Mode Command Reports 
-Classified report is now sent a few minutes after the blobs burst (Formerly 4 seconds)
-Classified blob reports now have the same name as admin-classified reports, so they can't just meta the contents based on the paper's name alone
 2014-08-30 11:06:11 -06:00
ikarrus
5eed668e33 In the interest of keeping it clean and simple, only either survivors or escapees are reported. 2014-08-29 21:57:50 -06:00
ikarrus
6d79ac49d1 Only Admins can see Ready Players in Lobby 
Removes a lot of potential metagaming by stopping players from counting or remembering who readied up during the lobby.
 2014-08-29 21:49:44 -06:00
ikarrus
674862e2b7 Formatting cult and rev stats the same way as the others I added 2014-08-29 21:29:26 -06:00
ikarrus
7dc89c0d10 More Detailed End-Round Report 
End-Round report will now also declare some round statistics, including
-Round duration
-Station integrity
-Total population
-Survival Rate
-Evacuation Rate
-Command's Approval Rating (During rev only)

Bugfix:
-Ending the round as a brain will no longer report to the player that they have survived
 2014-08-29 21:24:30 -06:00
ikarrus
a49f4e77ae Holiday events will stop failing False Alarm events. 2014-08-29 09:15:23 -06:00
Miauw
98d567dde7 more say bugfixes 2014-08-29 14:40:51 +02:00
ikarrus
291f0f5716 Holiday Events no longer fire false alarms 
Fixes #4597
Also fixes wierd identation
 2014-08-28 23:05:14 -06:00
ikarrus
a8732d4219 One more holiday event to label 2014-08-28 22:58:57 -06:00
ikarrus
723f1c46b0 Matches the real messages a little better 2014-08-28 22:27:06 -06: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
761d02577d minor change of wording 2014-08-28 22:19:58 +02:00
Joonatan O'Rourke
492a043f47 fixed reinforced tables 
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
 2014-08-28 20:02:55 +03:00
Jordie0608
4d14bd2dc6 Greens Viro, fixes building glass med airlocks 2014-08-28 23:00:21 +10:00
Miauw
3c0afa4e0a Fixes another holopad bug. 2014-08-28 13:34:54 +02:00
Firecage
f20c97b59e Updates to shower 2014-08-28 12:02:36 +02:00
quiltyquilty
b344431648 enforces consistency 2014-08-27 18:08:08 -05:00
quiltyquilty
0739769acb does what giacom told me to do 
renames some hairs
adds a few more that snapwalk made
 2014-08-27 17:46:47 -05:00