cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 11:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,463 Commits 61 Branches 14 Tags
8e32c007ed8db992c4a2e6a17153cb005e104e62
Commit Graph

5111 Commits

Author SHA1 Message Date
Malkevin
8e32c007ed Made the new prisoner ID box a parent of /box instead of /box/ids, 2013-05-11 17:32:11 +01:00
Malkevin
26cf12cf1a Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonercards 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-05-11 17:18:34 +01:00
Ikarrus
5b5f880ab2 -Replaced bridge tcoms monitor with power monitor 
-Fixed thunderdome blast doors not working
-Added a small dressing room to centcom so I don't have to spawn them each and every time
-Renamed some centcom areas, including the admin prison to make it easier to send players there
 2013-05-11 00:36:13 -06:00
Cheridan
8b544bb9a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-08 11:26:43 -05:00
Pete Goodfellow
ffc42099e1 Merge pull request #521 from Rolan7/ClownstampBugfix 
Fixes the bug where clown stamps were usable by anyone
 2013-05-08 08:33:15 -07:00
Pete Goodfellow
b4fe1eded0 Merge pull request #484 from Ikarrus/clonebeard 
Bearded Clones
 2013-05-08 08:28:37 -07:00
Malkevin
f53202e158 Added a box of prisoner ID cards to the perma wing 
Aside from further dehumanizing criminal scum this also serves as a way of correcting the annoying behavior of suit sensors and crew monitoring computers, and chemical implants: if someone isn't wearing an ID card (which prisoners will likely have taken from them) they show up as an Unknown.

Also included a sec hud icon for the prisoner 'job'
 2013-05-08 01:09:32 +01:00
Cheridan
3d8fda7c26 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-06 15:41:50 -05:00
Malkevin
086ac268b3 Changed all crit checks from static zeros to config.health_threshold_crit 2013-05-06 18:31:51 +01:00
Rolan7
5bc16a523e Fixes the bug where clown stamps were usable by anyone, they just didn't affect the sprite. 
Also made the stamp check for clumsiness instead of mind.assigned_role.
 2013-05-05 20:53:15 -04:00
Malkevin
b91889ba29 Changed the health check for crit in life.dm for humans, monkeys, and aliens from < 0 to <= 0. 
Fixes that weird issue where people can take 5 laser hits to the face and still run around at 0 health until someone sneezes on them or they stub their toe.
 2013-05-05 17:38:30 +01:00
Cael Aislinn
1fa40ccd22 Merge pull request #514 from Tastyfish/cablez 
Addressed hulk speach inconsistant punctuation and cable coil problem
 2013-05-05 02:43:23 -07:00
Tastyfish
d20c7a4bd2 Made hulk talking change all periods to exclamation points 2013-05-05 05:32:01 -04:00
Tastyfish
7b325f9c6e re-arranged cable actions so src wouldn't get deleted before everything was completed 2013-05-05 05:17:31 -04:00
Cael Aislinn
30cf4cd5d4 Merge pull request #502 from Ikarrus/stealdisk 
Nuke disk as standard steal objective
 2013-05-05 00:40:29 -07:00
Cael Aislinn
273ccdc8c3 Merge pull request #479 from Tastyfish/pipes 
Fixed problems with placing atmos machines connecting to the wrong thing.
 2013-05-05 00:39:40 -07:00
Carnie
4ca7b5079b Merge pull request #503 from Ikarrus/medalicon 
Minor fix for medals - makes overlay update when pinning a medal to somebody else.
 2013-05-04 17:20:42 -07:00
Pete Goodfellow
7111f86a2b Merge pull request #432 from Rolan7/master 
Issue 113 mob->closet->wall glitch fix.
 2013-05-04 11:18:42 -07:00
Cheridan
a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 
Conflicts:
	maps/tgstation.2.1.2.dmm
 2013-05-04 13:04:47 -05:00
Ikarrus
7694776d1f Added a update_inv_w_uniform(0) to pinning medals, so it shows up on the mob icon. 2013-05-04 11:19:49 -06:00
Ikarrus
fc4c10c63e Replaced pinpointer steal objective with the nuke disk. 2013-05-04 11:06:39 -06:00
Cael Aislinn
827c72fb72 Merge pull request #483 from kyrahabattoir/gui_stamps 
[MAP]Graphical stamps on documents.
 2013-05-03 22:04:31 -07:00
Cael Aislinn
f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1 
Closet Cleanup and Bins.
 2013-05-03 21:57:53 -07:00
Cael Aislinn
b1402b48ea Merge pull request #498 from Giacomand/bringbacksoap 
Re-added Syndie Soap
 2013-05-03 21:46:26 -07:00
Cael Aislinn
242fc2813f Merge pull request #449 from TwistedAkai/master 
Syringe log: Resolves issue #321
 2013-05-03 21:45:09 -07:00
Cael Aislinn
2f57c45e76 Merge pull request #478 from Malkevin/meltablefloortiles 
Recyclable floor tiles
 2013-05-03 21:16:10 -07:00
Giacomand
35f6a979bc * Small fix for closets picking up anchored items. 
* Made closets/crates pick up on their turf during initialization.
 2013-05-04 05:07:36 +01:00
Aranclanos
74fb61eeee Merge pull request #463 from Ikarrus/reactive 
[MAP] Reactive Armor as objective
 2013-05-03 19:24:58 -07:00
Malkevin
3d1a96975f reverting last commit. 
Wt.remove_fuel is 0 for a reason
 2013-05-04 02:07:20 +01:00
Malkevin
f8fa1fce09 Welding rods/shards/floortiles now costs welderfuel 2013-05-04 01:44:31 +01:00
Malkevin
9d673f1bd0 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles 2013-05-04 01:34:34 +01:00
Giacomand
77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand
b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand
343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station. 
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
 2013-05-03 22:32:17 +01:00
Giacomand
1d8df3874a * Re-added soap after it was mistakenly forgotten after the https://github.com/tgstation/-tg-station/pull/194 conversion. 2013-05-03 17:49:53 +01:00
Blaank
dd9d3fce8d Changed a name so the Chemmaster 3000 will close the interface window when the [close] button is pressed. Previously when the [close] button was pressed it would do nothing and the interface window had to be closed via the window controls. 2013-05-02 23:06:42 -05:00
Cheridan
5f933e2d3e Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-02 11:53:30 -05:00
Cheridan
725718dd5b -Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines. 
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
 2013-05-02 11:52:55 -05:00
Malkevin
e2b8a45d42 Merge branch 'master' of https://github.com/tgstation/-tg-station into irongrinder 
Conflicts:
	html/changelog.html
 2013-05-02 15:11:23 +01:00
Malkevin
5cef64f237 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles 
Conflicts:
	html/changelog.html
 2013-05-02 15:07:33 +01:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework 
Resolves #283
 2013-05-02 05:46:44 -07:00
Ikarrus
af02fdf629 Males are cloned with a full beard. 2013-04-30 21:00:35 -06:00
Pete Goodfellow
73b751d20b Merge pull request #476 from tgstation/fix 
Reverting stray changes from my merge of #464
 2013-04-30 14:07:16 -07:00
Kyrah Abattoir
cf13402d86 Added pictures for all the different stamps in the game to show them on paper. 
Changed the way stamps are displayed in html (no <HR> between them, only one at start).
Made the QM and law office stamps unique (and changed them in the maps).
Made the default stamp a "granted" stamp.
Added a "granted" stamp and paper_stamp sprite (green checkmark).

Signed-off-by: Kyrah Abattoir <github@kyrahabattoir.com>
 2013-04-30 21:43:00 +02:00
Pete Goodfellow
aa3efe20d6 Here's the proper cable.dm 2013-04-30 16:32:07 +01:00
Cael Aislinn
29cd502c8b Merge pull request #440 from Giacomand/c4_act 
New suicide_act for C4
 2013-04-30 04:56:19 -07:00
Tastyfish
ccc2c099dc Fixed some atmos machine New()'s not calling base's new at right time, and more importantly, initialize() selects new connections rather than aborting if previously connected, as the point of the initialize proc is for construction 2013-04-30 06:18:54 -04:00
carnie
ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Malkevin
e9a5f9df8a Added Plasteel (iron + plasma) and Reinforced Glass (iron + silicon) 2013-04-30 03:16:03 +01:00
Malkevin
a010b11b83 Recyclable floor tiles 
Adds the code to weld floor tiles together to make sheets, just like rods except it takes 4 tiles instead of 2 rods.
 2013-04-30 02:59:20 +01:00