cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,764 Commits 61 Branches 14 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

15081 Commits

Author SHA1 Message Date
Remie Richards
643de0c922 Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue. 2015-03-07 18:46:02 +00:00
Remie Richards
04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes 
Fixes adminjump being dumb.
 2015-03-07 18:17:41 +00:00
Miauw
f84f6aafcd Fixes adminjump being dumb. 2015-03-07 19:00:48 +01:00
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah 
Adds the ore satchel of holding
 2015-03-06 15:15:40 -06:00
Cheridan
377dd9f876 Merge pull request #8142 from phil235/girderfixes 
Fixes many checks in construction from stacks,
 2015-03-06 13:54:09 -06:00
hornygranny
68c791ee7c Merge pull request #7751 from RemieRichards/ProceduralGeneration 
Procedural Map Generator System
 2015-03-06 11:49:21 -08:00
hornygranny
d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops 
Nuke Op Loot Pinata Tweaks
 2015-03-06 11:48:07 -08:00
Cheridan
0496dcd446 Merge pull request #8169 from dannno/morebarsigns 
adds more barsigns
 2015-03-06 13:35:13 -06:00
Cheridan
92a40fc470 Merge pull request #8126 from Iamgoofball/raginmages 
fixes Ragin' Mages making only 1 mage
 2015-03-06 13:04:48 -06:00
Cheridan
d5ec11b91c Merge pull request #8080 from Incoming5643/Appearance_fix 
Tweaks and fixes for the appearance window
 2015-03-06 12:20:24 -06:00
Cheridan
6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood 
Removes the Spooky
 2015-03-06 00:09:25 -06:00
Cheridan
d56cb89407 Merge pull request #8076 from xxalpha/lighters 
Grayscale Lighters
 2015-03-06 00:00:51 -06:00
Cheridan
9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash 
Cooking fixes for meat and trash
 2015-03-05 23:54:29 -06:00
Cheridan
6b633c35d2 Merge pull request #8145 from Incoming5643/dangit_bobby_its_all_ones_and_zeros 
Hotfix for Blob mulligan rounds not ending | Nuke codes being given in times of peace | AI desiring to blow up the station
 2015-03-05 23:33:42 -06:00
Cheridan
8fa6b3edea Merge pull request #8140 from phil235/doughbeakerfix 
Improvised heating fixes
 2015-03-05 22:58:44 -06:00
Cheridan
07676b352d Merge pull request #8128 from Ikarrus/gangfixup 
Makes Gang mode functional again
 2015-03-05 21:11:59 -06:00
Cheridan
50b8e2267e Merge pull request #8146 from phil235/HydroTrayLightsSpritesFix 
Fixes HydroTray Lights sprites.
 2015-03-05 20:28:33 -06:00
Incoming
546c5eedc4 if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human 2015-03-05 14:23:19 -05:00
dannno
354f59f10c adds more barsigns 2015-03-05 14:06:44 -05:00
Swag McYolosteinen
a341fd72b0 Merge pull request #8065 from paprka/squiddeath 
Rebalances thermals
 2015-03-05 19:14:57 +01:00
Swag McYolosteinen
daa6fa89d0 Merge pull request #8014 from paprka/altclick2 
Alt click for PDAs
 2015-03-05 19:13:07 +01:00
Swag McYolosteinen
372e082c66 Merge pull request #8013 from paprka/altclick 
Alt-click for aesthetic toggling
 2015-03-05 19:12:07 +01:00
WJohn
1c55a568f2 Merge pull request #8075 from Xhuis/the_coderbus 
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
 2015-03-05 13:08:33 -05:00
Swag McYolosteinen
93a5ba6e16 Merge pull request #8132 from MrStonedOne/wellthen 
Fixes irc alerts of adminhelps not showing the ckey
 2015-03-05 19:02:15 +01:00
Swag McYolosteinen
652bac070b Merge pull request #8156 from Mandurrrh/trailsbugfix 
Fixes #8116 trails bug
 2015-03-05 19:00:39 +01:00
Razharas
2a3c211d81 Merge pull request #8131 from Jordie0608/sooneverythingwillbechangelogs 
Re-adds changelog popup as a config option
 2015-03-05 12:06:19 +03:00
Cheridan
f68fd02d26 Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget 
On screen alert system
 2015-03-04 19:39:04 -06:00
Mandurrrh
48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Cheridan
e2554c55e6 Merge pull request #8147 from Cheridan/master 
Manual Merge of #7607
 2015-03-04 00:39:34 -06:00
Cheridan
56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll 
Conflicts:
	code/game/gamemodes/blob/overmind.dm
 2015-03-04 00:33:44 -06:00
Cheridan
aa8565ff9f Merge pull request #8106 from Ikarrus/preserveobjectives 
Preserve Objectives when admins remove antag status
 2015-03-04 00:13:23 -06:00
Cheridan
3fd821bdd7 Merge pull request #7986 from phil235/TaserJitterFix 
Fixes taser stun duration
 2015-03-04 00:01:49 -06:00
Cheridan
39cccb82e4 Merge pull request #8123 from Ikarrus/randomspawns 
Randomizes Order of Job Spawn Points
 2015-03-03 22:57:16 -06:00
phil235
12d677a97b Fixes HydroTray Lights sprites. 2015-03-04 02:08:34 +01:00
Incoming
83cb66e3a3 Prevents centcom from sending the nuke code to a station that already defeated the blob (because you know they'd still blow themselves up) 2015-03-03 19:49:36 -05:00
Incoming
44d30afd20 Hotfix for Blob mulligan rounds. WHOOOOOPS 2015-03-03 19:42:01 -05:00
phil235
f5279273f1 Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example. 2015-03-03 23:43:17 +01:00
Incoming
8192ea7e06 Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz. 2015-03-03 16:55:02 -05:00
phil235
bb10824737 Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker. 
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
 2015-03-03 22:35:11 +01:00
Remie Richards
d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
 2015-03-03 20:58:38 +00:00
Incoming
a028062624 Skeletons and zombies lose temperature immunity and radiation immunity, reducing how awesome they are in the face of their relative ease of access. They still don't breathe or have blood. 2015-03-03 14:46:32 -05:00
Razharas
64d0af336d Merge pull request #8099 from Incoming5643/doublemint_heads 
Fixes duplicated heads
 2015-03-03 21:32:46 +03:00
Xhuis
2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
MrStonedOne
90e46f35bb Fixes irc alerts of adminhelps not showing the ckey 
Also fixes irc alerts of new players having the source split up in the announcement messages
 2015-03-03 04:05:08 -08:00
Swag McYolosteinen
5fcf0570b7 Merge pull request #8118 from Mandurrrh/pdabugfix 
Fixes GhostPDA bug making it show in lobby. Please merge quick.
 2015-03-03 11:26:48 +01:00
Swag McYolosteinen
c2290c6c5c Merge pull request #7913 from phil235/NewPlants 
Adds new plants to botany
 2015-03-03 11:23:32 +01:00
Jordie0608
e6e2ec2809 Readds changelog popup as a config option 2015-03-03 19:51:35 +11:00
Ikarrus
e7109f984f knockout on conversion 2015-03-03 00:42:11 -07:00
Razharas
665afe10e1 Merge pull request #8104 from Ikarrus/changelognotify 
Chatlog notification of changelog updates
 2015-03-03 10:36:57 +03:00
Ikarrus
4d25d10d91 Increased chance of deconversion when applyinb brute force to head. The more hurt they are, the more likely they are to deconvert. 2015-03-03 00:30:29 -07:00