cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 19:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,552 Commits 61 Branches 14 Tags
54154bec12fec1e8d0b2be2d2d51c2ded2fc9488
Commit Graph

8831 Commits

Author SHA1 Message Date
Iamgoofball
54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
phil235
1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
 2015-04-06 19:38:51 +02:00
WJohn
9c4e744fc9 Merge pull request #8744 from xxalpha/cyberplus 
Better sprites for chest cyber implants.
 2015-04-06 12:43:10 -04:00
Cheridan
1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2 
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
 2015-04-05 21:54:33 -05:00
Remie Richards
a965f17c3c Corrects return values, fixes cell draining. 2015-04-05 22:03:41 +01:00
Remie Richards
5884c3727f Fixes nonnumerical defines, Special interaction should work nicer now. 2015-04-05 21:52:42 +01:00
Remie Richards
cb86467e47 Consistency with X_act() names, Ninjas can now electrocute carbon mobs by "draining" them, as they would a cell/smes/mecha etc. 2015-04-05 02:30:43 +01:00
Remie Richards
9c6c68b81a Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas) 2015-04-05 01:55:27 +01:00
Remie Richards
bebe775021 Splits ninja glove drain() proc up into /atom/proc/ninjaDrainAct() 2015-04-05 00:09:28 +01:00
xxalpha
8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
phil235
6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes 
Recieve --> Receive
 2015-04-04 20:00:21 +02:00
Remie Richards
5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
Jordie
6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings 
Someone called for pest control?
 2015-04-04 20:58:07 +11:00
Jordie
3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus 
Cyber Implants +
 2015-04-04 20:57:48 +11:00
Jordie
13a6a51550 Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately 
Removes slowdown from Reactive Teleport Armor and increases activation chance
 2015-04-04 20:57:33 +11:00
Jordie
19af7bd19e Merge pull request #8570 from RemieRichards/FireSpread 
Fire spread on mob touch
 2015-04-04 20:56:58 +11:00
Jordie
7dbd8b1d02 Merge pull request #8706 from phil235/WeakenedFix 
Fixes weakened/stunned/paralysis not going down naturally for aliens.
 2015-04-04 20:56:32 +11:00
xxalpha
7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix 
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
 2015-04-03 19:42:34 +03:00
Cheridan
0bd95eaa54 Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL" 2015-04-02 21:13:50 -05:00
phil235
e834781427 Fixes weakened/stunned/paralysis not going down naturally for aliens. 2015-04-02 23:25:08 +02:00
Jordie
4c1c55906f Merge pull request #8666 from phil235/AnimalsUpdatehealthFix 
Fixes simple_animals being immune to fire damage melee attacks.
 2015-04-02 20:16:18 +11:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
GunHog
89a8e8dea4 Fixes Reactive Teleport Armor 
- Makes the armor actually teleport again!
 2015-04-01 21:14:02 -05:00
GunHog
c9e7d949e1 Buffs teleportation chance to 50 percent! 
- Also prepares the ritual sacrifice to the Eternal Jordie, God of
Changelogs.
 2015-04-01 20:49:42 -05:00
dannno
6e83015145 fixes critical priority bug 
jesus christ think of all those g's. jesus fucking christ. what have we done
 2015-04-01 21:49:14 -04:00
GunHog
1f85f785f8 Removes slowdown from Reactive Teleport Armor 2015-04-01 16:46:03 -05:00
hornygranny
35498dc200 Merge pull request #8686 from sawu-tg/npcpool 
Fixes to SNPCs
 2015-04-01 11:47:57 -07:00
Sawu
799eadb6c8 Fixes to SNPCs 
* Fixes two runtimes (stat menu and taking a delegate/assistant)
* Fixes SNPCs not being inserted into the NPCPool
* Makes the NPCPool fire more often for maximum robustness.
 2015-04-02 05:19:21 +11:00
Swag McYolosteinen
e886207f58 Merge pull request #8684 from Cheridan/chem_farts 
AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL
 2015-04-01 18:29:25 +02:00
Cheridan
3ac4d299c9 Merge pull request #8657 from Jordie0608/thisdrillisalsobrokenbutforadifferentreason 
Reworks cyborg drill's power usage handling and fixes recharging
 2015-04-01 08:25:46 -05:00
Cheridan
053046c970 typo fix 2015-04-01 06:28:23 -05:00
Jordie
691411c76c Merge pull request #8648 from Cheridan/collared 
Fixes collar stuff
 2015-04-01 18:45:02 +11:00
Jordie
2484674261 Merge pull request #8651 from xxalpha/atmosuitfix 
Fixes atmos hardsuit pathing.
 2015-04-01 18:44:49 +11:00
Jordie
904b27dcd7 Merge pull request #8607 from Iamgoofball/fuck 
Fixes *flip
 2015-04-01 18:44:20 +11:00
Jordie
b9753b8bb9 Merge pull request #8519 from dannno/WEEEOOOOWEEEEOOOO 
WEEEOOOO WEEEEOOO WEEEOOO
 2015-04-01 18:43:43 +11:00
Iamgoofball
86a1c9927a removes feedback msg, fixes checks 2015-03-31 20:13:09 -07:00
hornygranny
89fd1ba9c4 Merge pull request #8595 from ACCount12/dredd 
Firing pins update
 2015-03-31 16:34:35 -07:00
phil235
9261196b4f Fixes simple_animals being immune to fire damage melee attacks. 
Fixes slime being able to latch onto other slimes with mouse_drop (but not the feed verb)
 2015-03-31 21:29:34 +02:00
Swag McYolosteinen
d8c588867a Merge pull request #8634 from sawu-tg/master 
See #7217
 2015-03-31 19:40:33 +02:00
dannno
d1eb8fcaec Merge branch 'master' of https://github.com/tgstation/-tg-station into WEEEOOOOWEEEEOOOO 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-03-31 13:01:09 -04:00
Jordie0608
d2600d8ea2 whoops 2015-03-31 21:51:48 +11:00
Jordie0608
e70134a37a made warning function not really dumb 2015-03-31 21:49:07 +11:00
Jordie0608
879659a3d1 cyborg drills use internal battery first + charging fix 2015-03-31 21:24:48 +11:00
Jordie
b62eb672da Merge pull request #8618 from Xhuis/my_ears_they_bleed 
Separates ship ambience and area ambience
 2015-03-31 19:16:59 +11:00
Jordie
2d94da8e59 Merge pull request #8592 from phil235/AlienAttackBlob 
Fixes alien humanoids not being able to attack blobs.
 2015-03-31 19:11:12 +11:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing 
Fixes alien nest buckling
 2015-03-31 00:06:14 -05:00
xxalpha
ccb4405de4 Fixes atmos hardsuit pathing. 2015-03-31 03:50:11 +01:00