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
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

108 Commits

Author SHA1 Message Date
AnturK
5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
TrustyGun
5bbb78024f Removed all instances of the handcuffs from the map and added them to the arcade machine 2016-01-31 14:15:44 -05:00
Jordie0608
3eba936d34 generalises simple animal loot drops and removes copypasta 2015-12-24 23:34:46 +11:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path. 
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
 2015-11-16 18:55:57 -05:00
Xhuis
25621e29fc VOMIT GENERALIZATION 2015-10-04 17:09:07 -04:00
Remie Richards
025fcecb6c Merge pull request #11820 from Aranclanos/oriontrail 
Fixes the href exploits in the orion trail arcade machine
 2015-09-19 14:16:03 +01:00
Aranclanos
4a85827fa6 Fixes the href exploits in the orion trail arcade machine 2015-09-16 16:14:23 -03:00
Marc R. Uchniat
3c314cc0ac fix sell crew text in orion trail, fixes #11807 2015-09-15 17:51:08 -07:00
A Manifestation
f76e8e8af5 Fixed! 2015-09-11 14:30:13 -07:00
blah
bcdf5666e8 Fixes Orion Trail properly the error was a rogue ! in the top of the topic that was added by accident 2015-09-07 18:37:41 +01:00
Jalleo
f0834b4ed5 Revert "Fixes more than one prize win in Orion Trail" 2015-09-07 09:44:00 +01:00
blah
b407d4dcde Removes accidental whitespace 2015-09-04 17:07:31 +01:00
blah
07eaa9821e I fucked it up Miauw told me how 2015-09-04 16:50:52 +01:00
blah
35dd40e8ab Another suggestion by Miauw that might work better 2015-09-04 16:02:38 +01:00
blah
de92cf5bad Better fix suggested by Razharas turns = 1 at win proc 2015-09-04 15:53:36 +01:00
blah
945e6fd07c Better fix by having a check in the if statement 2015-09-04 15:05:43 +01:00
blah
2b925a17c4 Hopefully 2015-09-04 13:53:55 +01:00
Xhuis
fdc060a015 Xenomorph action figure 2015-08-26 17:33:59 -04:00
Remie Richards
f006f9d918 Fixes some glitches with Orion Trail events, Fixes Orion Trail events not properly choosing from the entire pool of events. 2015-08-16 19:36:44 +01:00
Cheridan
e6fe8baa24 Astral Tiles 1.01 - Fun Removal 2015-08-09 23:02:32 -05:00
Cheridan
d915997ea7 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057 
Conflicts:
	icons/obj/items.dmi
 2015-08-08 19:36:36 -05:00
Remie Richards
8950ac851d Condenses some code. 2015-08-08 01:49:27 +01:00
Remie Richards
f256246711 Merge branch 'master' of https://github.com/tgstation/-tg-station into OironTrailAdditions 
Conflicts:
	code/game/machinery/computer/arcade.dm
 2015-08-08 01:38:57 +01:00
Cheridan
eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
Remie Richards
7318f11d3f Adds new content to the Orion Trail arcade game, Replaces all the magic strings with #defines, Fixes being able to spamclick the game. 2015-08-02 18:11:47 +01:00
bgobandit
0a6d65472c Fixes bug. Restores /retaliate to blacklist. Adds changelog. 2015-07-31 12:06:57 -04:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Jordie0608
25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-06-20 17:32:16 +10:00
Cheridan
565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit 
Overlays for computers
 2015-06-14 10:25:27 -05:00
Jordie0608
3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours 
Conflicts:
	icons/obj/chemical.dmi
 2015-06-13 20:23:29 +10:00
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
Cheridan
d559957683 Adds Ban to name_action list. 2015-06-10 10:18:12 -05:00
Jordie0608
77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
Cheridan
1c2f2bd7f4 Adds Sound Effects to Arcade RPG 2015-06-08 23:34:19 -05:00
KorPhaeron
97990c94cc Changes how destroying turfs works 
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
 2015-05-29 18:43:34 -05:00
Incoming
6e25a57230 Adds Antag Tokens! 
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
 2015-04-23 19:08:38 -04:00
Jordie
9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah 
Foam force fuck yeah!
 2015-03-25 16:30:42 +11:00
Szunti
01c18eadca Replaced prob(rand(A,B)) with prob((A+B)/2). 
They are the same probability.
Rounded to integers where the values were literals.
 2015-03-21 19:12:16 +01:00
Fayrik
b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
Xhuis
03fcb9e139 Makes the machine less deadly to non-users 2015-03-20 07:23:59 -04:00
Xhuis
32d40b67a6 Adds emagged mode to the Orion Trail 2015-03-09 17:20:36 -04:00
dannno
23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT 
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
 2015-02-26 16:36:44 -05:00
TheVekter
9bf58de009 Added red button 2015-02-03 08:25:50 -06:00
Delimusca
a00714f140 added foam armblade 2015-01-26 18:06:42 -07:00
joonoro
716e14f716 Fixes arcade machine runtimes from #6351 2014-12-30 21:11:22 +02:00
joonoro
663e7d673a Fixes arcade machine runtime from #6351 2014-12-30 17:33:52 +02:00
Hornygranny
678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
TZK13
45488f7ea4 Adds a new prize mech based on the mime mech. 2014-10-21 10:26:01 -05:00
TZK13
e45057b30e Adds space carp plushies! 2014-10-21 01:12:03 -05:00
TZK13
77c2f097ec Adds a new meteor toy to arcade machines. 2014-10-20 05:01:14 -05:00