cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 22:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,643 Commits 61 Branches 14 Tags
a122e156c4eefbb62b9aa4265574ebd9c2040ec8
Commit Graph

9323 Commits

Author SHA1 Message Date
phil235
a122e156c4 Fix legcuffing when stepping on two traps. 
Prevents having two beartraps on your legs, which results in one of the two not appearing after resisting.
 2014-04-25 00:07:28 +02:00
phil235
999e9eab15 missing parenthesis 2014-04-24 21:56:22 +02:00
phil235
ee6a8baed4 Some fixes for beartraps 2014-04-24 21:41:56 +02:00
Aranclanos
09095d3036 Merge pull request #3518 from Aranclanos/ServerCrash 
Server crash fix.
 2014-04-24 02:18:10 -03:00
Cheridan
22d6100c2e Merge pull request #3487 from Nerolat/halltweek 
Nerfed hallucination sting
 2014-04-23 12:58:30 -05:00
fleure
579b705f24 Merge pull request #3492 from Firecage/master 
Roboticist on Preference screen Fixes #1145
 2014-04-23 16:44:11 +01:00
fleure
7539e59679 Merge pull request #3497 from phil235/AlienMonkeyAtkMsgFix 
Partial fix for #1344
 2014-04-23 15:16:56 +01:00
fleure
6f341016dd Merge pull request #3494 from phil235/MedbotRedmsgFix 
medbot injection message now only bold red for target.
 2014-04-23 15:14:13 +01:00
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix 
Fix for #3151
 2014-04-23 15:12:38 +01:00
fleure
4a0d59e81c Merge pull request #3485 from Nerolat/cyborgcult 
Doesn't announce that a player was de-culted or de-reved after making them a silicon. Fixes #3351
 2014-04-23 15:09:47 +01:00
fleure
7d9e758c9f Merge pull request #3467 from MrPerson/grabby_patties 
Make grabs GC, fix a grab related runtime
 2014-04-23 14:57:02 +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
Aranclanos
1f74292923 Fixes a server crash due to infinite loops related to atmos unary machines interacting with eachother. 2014-04-23 02:10:03 -03:00
MrPerson
e12a567000 Merge pull request #3484 from VistaPOWA/pr_announce_security 
Security fixes for PR announcer
 2014-04-22 15:17:07 -07: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
df8b266d38 Merge pull request #3445 from Incoming5643/magicmania1.6 
Magic Mania 1.6: Baby's Day Out
 2014-04-21 22:30:34 -05:00
Cheridan
f042b62182 Merge pull request #3468 from Giacom/revision_open_browser 
The links in the "show server revision" menu will now open in the user's default browser...
 2014-04-21 22:26:22 -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
Cheridan
fd62e88d6f Merge pull request #3448 from Ikarrus/lingchatlog 
[Admin] Added logging for changeling hivemind chat
 2014-04-21 21:55:19 -05:00
Incoming
be8671fcf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.6 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-04-21 19:00:04 -04:00
phil235
d12238db57 adding missing comma 2014-04-21 22:01:20 +02:00
phil235
0a4cc4a35e Monkey third party attack no longer bolded 2014-04-21 21:33:53 +02:00
phil235
fccf892445 Alien third party attack no longer bolded. 2014-04-21 21:30:41 +02:00
Cheridan
4539711d9a Merge pull request #3459 from MrPerson/screen_deletion 
Remove some unnecessary code of mine that's causing runtimes
 2014-04-21 13:26:49 -05:00
Nerolat
d83dae1070 Rebalanced as suggested 2014-04-21 21:05:48 +03:00
Cheridan
0a1c77964d Merge pull request #3469 from phil235/HornStunFix 
weapons with force below 5 now have no chance to knock down
 2014-04-21 12:58:29 -05:00
Cheridan
1450960ad7 Merge pull request #3462 from Niknakflak/AIdeathcore 
AIs.  New cores, death cores.
 2014-04-21 12:56:04 -05:00
phil235
382397a6ea Fix for #3151 
Removes the useless periods.
 2014-04-21 19:36:33 +02:00
Aranclanos
c8ab31734e Merge pull request #3493 from Miauw62/master 
Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"
 2014-04-21 14:32:48 -03:00
Cheridan
96e7c8293f Merge pull request #3457 from phil235/MachineConstrmsgFix 
Adds message after successfully unsecuring a machine.
 2014-04-21 12:30:50 -05:00
phil235
4ab83dc311 derp 2014-04-21 19:22:30 +02:00
Cheridan
7c4ea04c36 Merge pull request #3478 from Jordie0608/unfastedagirlwhatdo 
Fixed typo in grille fastening
 2014-04-21 12:20:49 -05:00
phil235
c119e4f3e7 small fix 2014-04-21 19:16:14 +02:00
phil235
fa51e607aa medbot injection message now only bold red for target. 
* adding span classes everywhere
* bold red message when the player is the one being injected/trying to be injected by medibot, otherwise just red message for other players.
 2014-04-21 19:12:57 +02:00
Cheridan
eb9ddcb6d1 Merge pull request #3471 from phil235/RwallRepairSpriteUpdateFix 
Fix for #1721
 2014-04-21 12:06:30 -05:00
Miauw
658c753989 Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2" 
This reverts commit f2d850ee25, reversing
changes made to 805e2570bf.
 2014-04-21 18:59:58 +02:00
Firecage
7577faff05 Merge branch 'master' of https://github.com/tgstation/-tg-station.git 2014-04-21 18:57:56 +02:00
Firecage
6610b1677a Signed-off-by: Firecage <firecage@hotmail.com> 2014-04-21 18:54:44 +02:00
Nerolat
da9b2602b6 Reverting 3 2014-04-21 19:29:22 +03:00
Miauw62
177cf95aa1 Merge pull request #3360 from Kelenius/blessing-fix 
Fixed a bug where holy water had to be applied twice for blessing
 2014-04-21 18:19:58 +02:00
Miauw62
f2d850ee25 Merge pull request #3218 from AndroidSFV/aiphotoext2 
AI Photography Extention #2
 2014-04-21 18:18:16 +02:00
Nerolat
1699d0c28a Reverting 2014-04-21 19:14:15 +03:00
Nerolat
165279aa3e Revert "Tweaked the stats more" 
This reverts commit a12d6bad9b.

Conflicts:
	code/game/gamemodes/changeling/powers/tiny_prick.dm
 2014-04-21 19:08:31 +03:00
phil235
46ac3c15f5 can't knock down if aiming at head. 2014-04-21 18:05:14 +02:00
Cheridan
0ecf8a5d9e Merge pull request #3465 from Giacom/pandemic_fix 
Ports a Pandemic machine fix
 2014-04-21 10:18:19 -05:00
Nerolat
9d55937d3b Fixed, so it can compile now 2014-04-21 16:26:10 +03:00
Nerolat
2ef9829e26 Modified hallucination code a bit and created a hallucination var limit. 2014-04-21 16:21:41 +03:00
Nerolat
a12d6bad9b Tweaked the stats more 2014-04-21 15:43:26 +03:00
Nerolat
4994d452c9 Nerfed the hallucination sting because now it is just a cheap parasting. Increased price and decreased effcts. 2014-04-21 14:48:19 +03:00
Nerolat
434eee790e Fixes #3351 2014-04-21 12:42:26 +03:00