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
11,643 Commits 61 Branches 14 Tags
a122e156c4eefbb62b9aa4265574ebd9c2040ec8
Commit Graph

2799 Commits

Author SHA1 Message Date
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix 
Fix for #3151
 2014-04-23 15:12:38 +01:00
fleure
47a23e1465 Merge pull request #3456 from phil235/TrayPinMsgFix 
Fixing rolling pin/tray attack stuff
 2014-04-23 14:52:58 +01:00
Cheridan
b441e34d14 Merge pull request #3390 from Ikarrus/deptmanagement 
Heads may use ID Modification Consoles to manage their department
 2014-04-21 22:51:57 -05:00
Cheridan
c3a3d00f82 Merge pull request #3470 from Giacom/default_wiki 
Changed the default wiki to tgstation13.org/wiki.
 2014-04-21 21:56:52 -05:00
phil235
382397a6ea Fix for #3151 
Removes the useless periods.
 2014-04-21 19:36:33 +02:00
Cheridan
7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo 
Fixed typo in grille fastening
 2014-04-21 12:20:49 -05:00
Jordie
10ea2eb771 Fixed typo in grille fastening 2014-04-21 11:21:45 +10:00
Giacomand
d1b0a76eae Changed the default wiki to tgstation13.org/wiki. 
Changed the wiki url format to work with the manuals, you can change the config if there are extra parameters, like title.
Fixed the telescience manual not linking to the telescience guide.
 2014-04-20 19:20:33 +01:00
phil235
57bba34352 missed a parenthesis 2014-04-19 21:12:10 +02:00
phil235
7314993d76 Fixing rolling pin/tray attack stuff 
* simplify the attack code.
* fix messages and lack of sound when attacking with the rolling pin.
* rolling pin and tray will now use their attack verbs hopefully.
 2014-04-19 20:53:45 +02:00
Menshin
a2a154aca9 Fixes for (#3441). 2014-04-19 14:02:37 +02:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Cheridan
440039f0a2 Merge pull request #3429 from Giacom/fix_manuals 
Fixes manuals being unreadable.
 2014-04-16 14:31:52 -05:00
ikarrus
5f5a470fe9 Merge branch 'master' of https://github.com/tgstation/-tg-station into steelpointcleanup 
Resolved Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-04-15 21:10:00 -06:00
Cheridan
a8c5e2ea24 Merge pull request #3389 from Ikarrus/notifyfix 
Fixed AI not being notified of new roboticist-built cyborgs slaved to it
 2014-04-15 14:15:43 -05:00
Giacomand
3a6672b639 Fixes manuals being unreadable. 2014-04-15 18:37:48 +01:00
ikarrus
b800d97e3c Changed execution chamber access to access_hos, removed bolt controls 2014-04-13 13:51:30 -06:00
Jordie0608
b18cc7d54e Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
 2014-04-11 02:51:07 +10:00
ikarrus
7213d8575a Heads may use ID Modification Consoles to manage their department 
-Heads may modify ID access for their department using ID computers
-Heads may only modify access that they get by default
-Heads may demote IDs if they are able to stip away all access from their card
-Heads may not modify a card's name or title, except when Demoting an ID
 2014-04-09 23:58:15 -06:00
ikarrus
13fa889b7f Fixed AI not being notified of new roboticist-built cyborgs slaved to it 2014-04-09 20:55:36 -06:00
Cheridan
31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor 
Jobcode refactoring TAKE TWO
 2014-04-09 13:52:37 -05:00
Daniel
30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel
6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
Steelpoint
35950b90fd SecMapChangeV3 2014-04-09 19:17:11 +08:00
Razharas
f44e3ffbf1 Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14 
More qdel() changes
 2014-04-08 15:37:44 -07:00
Miauw
5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization 
Conflicts:
	code/_onclick/telekinesis.dm
 2014-04-08 14:29:58 +02:00
MrPerson
dd8891ef35 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14 
Conflicts:
	code/game/machinery/camera/camera.dm
 2014-04-08 04:53:05 -07:00
Cheridan
bea449125b Merge pull request #3354 from Ikarrus/doorelectronics 
Updated the godawful Airlock Electronics interface
 2014-04-08 01:44:37 -05:00
Razharas
03b34893d5 Merge pull request #3343 from Giacom/small_fixes 
Fixes being able to change your chameleon jumpsuit's colour while dead.
 2014-04-07 18:48:05 -07:00
Razharas
ac72bcaa37 Merge pull request #3283 from Aranclanos/Blueprints 
Fixes blueprints not being able to generate a second area.
 2014-04-07 18:36:36 -07:00
Jordie0608
e58c90696a Hopefully merge conflict fixes 2014-04-07 21:46:06 +10:00
ikarrus
f4c327ba26 Updated the godawful Airlock Electronics interface 
Also added the ability to set if the door should require ALL listed accesses, or just one.
 2014-04-06 15:04:31 -06:00
iamgoofball
810b91e7ac removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists. 2014-04-06 11:46:12 -07:00
fleure
9db94d7c98 Merge pull request #3314 from Steelpoint/WaterTank 
Increase's jani water tank's starting space cleaner supply
 2014-04-06 17:16:06 +01:00
Giacomand
ce8baeabb9 Fixes being able to change your chameleon jumpsuit's colour while dead. 
Fixed an oversight with the red syndicate suits in the random uplink kit.
 2014-04-06 15:16:22 +01:00
Miauw62
447bf56908 Merge pull request #3313 from Aranclanos/FalseWalls 
Works with falsewalls and plasma asay logs.
 2014-04-05 20:20:51 +02:00
Aranclanos
53026a2483 Fixed the feedback messages for when you try to make a false wall with insufficient sheets. 
Merged the open/close close from false walls walls and reinforced false walls into one.
 2014-04-05 15:03:27 -03:00
Rockdtben
f6906addb2 Merge pull request #3285 from Steelpoint/JaniBelt 
Adds the janibelt!
 2014-04-04 08:10:21 -05:00
Steelpoint
3fe2530086 Fix 2014-04-04 21:06:30 +08:00
Steelpoint
0f3acabbaa AmountChange 2014-04-04 20:40:12 +08:00
Aranclanos
7c93c1229f Removed a spawn() from the Destroy() proc of falsewalls. 
Removed the falserwall type, now reinforced walls are a subtype of falsewalls.
Due to that, removed a bunch of copypasted code.
Falsewalls now spawn closed.
Falsewalls open/close timers are now proper, regarding their animation times.
You can't use a screwdriver on falsewalls while they aren't on a floor. (excluding shuttle floors)
Fixes issue #2338
Plasma falsewalls will now ignite.
Added a feedback message when you don't have enough sheets to create a falsewall.
Admin logs for igniting plasma walls, falsewalls, doors and airlocks.
Stadarized mineral_doors.dm.
 2014-04-04 09:18:39 -03:00
Razharas
5626ad9bbc Merge pull request #3275 from Aranclanos/TeleportersFix 
Fixes and some minor changes regarding teleports/portals code.
 2014-04-03 22:05:45 -07:00
Miauw62
47c463d0b2 Merge pull request #3276 from MrPerson/play_me_a_song_piano_man 
Make violin stop cutting off other sounds
 2014-04-03 20:26:58 +02:00
Steelpoint
1f4ff7204c More ALterations 2014-04-03 21:13:03 +08:00
Steelpoint
23a7847705 Alterations 2014-04-03 21:12:09 +08:00
Razharas
39196c6941 Merge pull request #3115 from Ikarrus/borgnotice 
AIs are notified when a cyborg is slaved to it
 2014-04-03 04:14:31 -07:00
ikarrus
f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
Cheridan
4dc2ccce1f Merge pull request #3266 from phil235/FireAxeCabineFix 
Fireaxe cabinet hacking now fails if player moves away
 2014-04-02 21:26:37 -05:00
ikarrus
f705141fce Resolved Conflicts: 
code/datums/wires/robot.dm
 2014-04-02 20:23:31 -06:00
Miauw62
af48fba65e Merge pull request #3247 from Firecage/master 
Mime Backpack
 2014-04-02 20:26:16 +02:00