cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-10 00:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,627 Commits 60 Branches 14 Tags
3bd3ff20ec4f4cbbbf71dc6809941d2fa539ae35
Commit Graph

25250 Commits

Author SHA1 Message Date
PKPenguin321
3bd3ff20ec adds a couple of naughty missing periods 
@cheridan uuuu
 2016-03-19 23:11:51 -07:00
PKPenguin321
03198df8a8 removes evil fucking comma from experimentor.dm 
jesus fuck this thing annoyed me every single god damn time i saw it and i am so glad i am finally removing it
 2016-03-19 22:24:03 -07:00
Cheridan
2c9c748a67 Merge pull request #16201 from KorPhaeron/rivers3 
Fixes rivers properly
 2016-03-19 23:56:46 -05:00
Cheridan
c6ab8b0041 Merge pull request #16165 from ChangelingRain/cultlock 
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
 2016-03-19 21:58:12 -05:00
Cheridan
aacd176cc0 Merge pull request #16177 from ChangelingRain/blobfix 
Fixes "Make Blob" admin button
 2016-03-19 21:54:10 -05:00
Cheridan
72256282cf Merge pull request #16162 from KorPhaeron/cats 
Restores runtime to his original look
 2016-03-19 21:48:21 -05:00
Cheridan
9a6e95e336 Merge pull request #16047 from RandomMarine/hallelujah 
Adds holy hand grenades.
 2016-03-19 21:43:48 -05:00
Cheridan
8eccbecccc Merge pull request #16199 from KorPhaeron/wizard2 
Wizard bag fix
 2016-03-19 21:30:13 -05:00
Cheridan
454af7cb2d Merge pull request #16197 from KorPhaeron/crates 
Adds abandoned crates to lavaland (sort of)
 2016-03-19 21:29:18 -05:00
Cheridan
529043d53c Merge pull request #15396 from LanCartwright/sensory 
Adds sensory.dm restoration and destruction viruses
 2016-03-19 21:07:14 -05:00
Cheridan
259f34f1a5 Merge pull request #15996 from optimumtact/atom_spawner_system 
Add infrastructure for safely spawning atoms at roundstart
 2016-03-19 20:41:33 -05:00
Cheridan
e57427fa8a Merge pull request #15712 from optimumtact/airemovalfinal 
Refactors the bulk string framework
 2016-03-19 20:34:36 -05:00
KorPhaeron
e773f22a3f Merge pull request #16227 from ChangelingRain/shitshowling 
Fixes shadowlings being literally invincible
 2016-03-19 20:22:53 -05:00
Cheridan
3b18b810c8 Merge pull request #16184 from KorPhaeron/sand2 
Lavaland Sand
 2016-03-19 20:22:36 -05:00
Nerd Lord
35c126a8d5 Fixes shadowlings being literally invincible 2016-03-19 21:14:34 -04:00
oranges
d4a5d61ea5 Minor tweak and fixes to subsystem logic 
-only process roundstart spawners when they're needed

-use the same method to call atom_spawners for template loading.
    Assuming user is adding to the appropriate process list, this will not
cause issues
 2016-03-19 22:41:38 +00:00
oranges
f9e6e2bca7 Add subsystem for safely spawning atoms at roundstart 
This system is called just before initialize and does not use a world
loop, so it is safe to spawn and create new atoms.

Any atom can inherit this behaviour by overriding the
spawn_atom_to_world proc and spawning atoms there at roundstart

Make sure you register the atom in question to the list of spawner atoms
by doing SSobj.atom_spawners += src, and then remove when you are done
spawning objects
 2016-03-19 22:41:38 +00:00
oranges
2311102c7b Refactors the bulk string framework 
In favour of a better json based solution
This overhauls:
    -AI ion laws
    -NPC chatter text

The system is extended to support further splitting of a chosen line
where a line is picked and then searched for subkey's in the form of
@pick(\D+) - sub keys are then picked from the appropriate list that
matches the \D+ key and replaced over top of the placeholder

This is used to add braindamage gibbering messages to the system
 2016-03-19 22:37:32 +00:00
Cheridan
e2903a6cba Merge pull request #16189 from ChangelingRain/suitless 
Space suits are much less likely to appear in the syndicate crate
 2016-03-19 16:32:53 -05:00
Nerd Lord
327f3e3eb2 implications 2016-03-19 13:36:42 -04:00
Nerd Lord
0342b7edb5 surprise override is a byond var and byond fucks up when you have an arg named like a var(oh my god why) 2016-03-19 11:24:15 -04:00
KorPhaeron
399ddb50f9 Merge pull request #16179 from Jordie0608/webeditorho 
Removes pointless message
 2016-03-19 08:37:51 -05:00
Joan Lung
a9a8b5c976 Merge pull request #16155 from MrStonedOne/patch-168 
makes emoji parsing return the text if they runtime
 2016-03-19 03:50:37 -04:00
Cheridan
240325821a Merge pull request #16169 from phil235/PackageWrapTKFix 
No more putting the wrapped object into the mob's hand if they're usi…
 2016-03-19 01:41:30 -05:00
Cheridan
9e091ae4c3 Merge pull request #16161 from MrStonedOne/patch-169 
Breathing requests a turf activation
 2016-03-19 01:36:35 -05:00
KorPhaeron
db57267e03 River 2016-03-18 23:16:50 -05:00
KorPhaeron
cfec4218fb Wizard 2016-03-18 21:45:57 -05:00
KorPhaeron
77805b6f64 Merge pull request #16168 from phil235/ChameleonUnderFix 
Fixes chameleon jumpsuit not working.
 2016-03-18 21:40:39 -05:00
Joan Lung
fe35066feb Merge pull request #16140 from KorPhaeron/fix2 
[s]Fix survival capsules (again)
 2016-03-18 22:24:34 -04:00
Joan Lung
4b43e9ed7d Merge pull request #16166 from KorPhaeron/smooth 
Re-adds smoothing to lava
 2016-03-18 22:20:10 -04:00
KorPhaeron
098abee0b6 Merge pull request #16174 from ChangelingRain/xxxray 
Xray lasers now have unique sprites and inhands
 2016-03-18 21:19:01 -05:00
Joan Lung
3b9f6ce783 Merge pull request #16156 from KorPhaeron/river_fix 
Fixes lava rivers running over ruins
 2016-03-18 22:15:49 -04:00
KorPhaeron
ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
Remie Richards
8a694237c3 Merge pull request #16167 from phil235/StrippingFix 
Fixes pulling mob when trying to strip them.
 2016-03-19 01:44:27 +00:00
KorPhaeron
f2b45dfec5 Merge pull request #16163 from F-OS/master 
Fixes Condiment bottles having inconsistent transfer amounts.
 2016-03-18 17:33:38 -05:00
Nerd Lord
e7a395a980 Space suits are much less likely to appear in the syndicate crate 
Nukeops can once again buy noslips(god)
 2016-03-18 18:01:00 -04:00
KorPhaeron
db20c9cf4f Lavaland Sand 2016-03-18 14:09:30 -05:00
Kyle Spier-Swenson
34ac54b0a8 Update life.dm 2016-03-18 02:28:30 -07:00
Jordie
f683b929e4 removes pointless message 2016-03-18 18:13:58 +11:00
Nerd Lord
6f860df56b fixes make blob admin button 2016-03-18 01:28:50 -04:00
Nerd Lord
e41a25549e Xray lasers now have unique sprites and inhands 2016-03-17 23:21:52 -04:00
phil235
1054e5156e No more putting the wrapped object into the mob's hand if they're using the packagewrap via telekinesis. 
Also no fingerprints of the user added to the package and item if used with telekinesis.
 2016-03-18 00:25:18 +01:00
phil235
6883a0dfda Fixes chameleon jumpsuit not working. 2016-03-18 00:06:18 +01:00
phil235
cf07f46b33 Fixes pulling mob when trying to strip them. 2016-03-17 23:38:32 +01:00
Cheridan
5823fda099 Merge pull request #16145 from Incoming5643/girder_your_loins 
Deinforces reinforced girders
 2016-03-17 17:36:10 -05:00
Joan Lung
e63b0bca1a Merge pull request #16075 from KorPhaeron/nuke_ops 
Fixes nuke ops spawning as plasmamen and exploding
 2016-03-17 17:52:42 -04:00
Joan Lung
dbc53e0f3d Merge pull request #16136 from LanCartwright/DNAFUCK 
Fixes DNA Restore dealing brain damage
 2016-03-17 17:48:09 -04:00
Joan Lung
c477cc764c Merge pull request #16108 from Jordie0608/thereareseveralwaysthiscouldbreakbutfortunatelynoneofthemwouldbemyfault 
Show-server-revision supports multiple test merges
 2016-03-17 17:47:18 -04:00
Joan Lung
f3f598225e Merge pull request #16129 from KorPhaeron/mutagen 
Adds a mutagen dispenser
 2016-03-17 17:46:37 -04:00
Joan Lung
87e54660c7 Merge pull request #16110 from KorPhaeron/chaos2 
Changes Chaos Guardian's attack
 2016-03-17 17:43:49 -04:00