cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-26 17:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,526 Commits 59 Branches 14 Tags
bc4d4e7ff348ada69a67bfbdab2b5f469247ffcb
Commit Graph

20573 Commits

Author SHA1 Message Date
kevinz000
2a51751dad Lets cyborgs use ladders (#31378) 2017-10-07 09:39:39 -04:00
Jordan Brown
4f860af265 Merge pull request #31383 from BeeSting12/youlights 
Fixes grammar on zippos
 2017-10-07 09:37:58 -04:00
AnturK
0dc9bd9d75 Fixes clockcult runtime 2017-10-07 07:46:18 -05:00
Kerbin-Fiber
dc8450a8f9 Fixes Wood Being Invisible. (#31364) 
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
 2017-10-06 22:45:45 -04:00
BeeSting12
4a02903e58 lights to light 2017-10-06 08:34:29 -04:00
Xhuis
c4b3bd8a55 Fixes runed metal and brass sprites 2017-10-06 03:18:19 -05:00
ShizCalev
41430d70db Sets decal layer 2017-10-06 03:11:32 -05:00
Joan Lung
9260c10566 Makes Ocular Wardens effective again (#31325) 
* Makes Ocular Wardens effective again

* get that, too
 2017-10-05 19:21:33 -05:00
oranges
dc731c991d Merge pull request #31315 from tgstation/Cyberboss-patch-3 
Removes shitty sleep from area/Entered
 2017-10-06 11:42:44 +13:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293) 
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
 2017-10-05 16:33:35 -04:00
Jordan Brown
dd882ba0c3 Removes old ass belt.dm (#31317) 2017-10-05 16:31:34 -04:00
Jordan Brown
d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit 
Does some code standardization/consistency.
 2017-10-05 15:53:11 -04:00
XDTM
35d8a55926 Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() (#30525) 
* Adds hostile environiment suits

* NOBODY SAW THIS

* the CURSE

* c

* No more stun removal

* fix

* a

* in the chest

* back

* Fixes

* duh

* fucking helmets fucking secbots fucking past coders

* yeah

* REEEEE

* revert to here

* this better work

* cyberboss

* Update effects.dm

* check for charges

* B U L K

* spraycans

* READY

* the if, man

* why the fuck did it convert to spaces

* Fix it
 2017-10-05 11:52:47 -04:00
YPOQ
5a616895ed Fixes crafting stacks without breaking crafted machinery (#31298) 
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
 2017-10-05 10:24:34 -04:00
AnturK
d17d66f5a3 Adds wigs (#31304) 
* Adds wigs

* spaces to tabs

* Move up
 2017-10-05 10:23:06 -04:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges
f700cb6331 Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 21:05:16 +13:00
Ashe Higgs
3f5696f91d Lizzers and plasmamen can now be servants of Ratvar (#31244) 
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
 2017-10-05 21:00:06 +13:00
Supermichael777
f770b69d5b Makes the pda font a prefernce (#31193) 2017-10-04 21:28:44 -03:00
Leo
6d08ebac83 Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 21:26:19 -03:00
Leo
85d717350d Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 21:25:31 -03:00
oranges
a47dc83a1b Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-05 10:33:09 +13:00
Jordan Brown
56ef3ab5a4 Removes shitty sleep from area/Entered 2017-10-04 15:28:17 -04:00
kevinz000
aeadbceb27 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:02:44 -05:00
Jordan Brown
fdfc4137ee Merge pull request #31245 from Robustin/swordfix 
Fixes Cult 2H Sword Soulshards
 2017-10-04 14:02:26 -04:00
bawhoppen
9b7f1ada6b Moves all stack object sprites from items_and_weapons.dmi to their own file (#31273) 
* keeko

* forgot the file
 2017-10-04 12:59:27 -04:00
ExcessiveUseOfCobblestone
9d3dcfbc55 Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:59:44 -04:00
ninjanomnom
436bffbb77 move shuttleRotate into the shuttle module 2017-10-04 02:54:13 -04:00
ShizCalev
e4a9de46dd Correctly applies wizard names 2017-10-03 19:25:53 -04:00
AnturK
72f711cc70 Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-04 12:18:58 +13:00
XDTM
6ed612ce77 Adds the advanced medical scanner, gives one to the CMO (#31179) 
* Adds the advanced medical scanner, gives one to the CMO

* MORE SCAN DOC

* dots
 2017-10-04 12:15:43 +13:00
oranges
47a74d8cf3 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-04 12:14:32 +13:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
oranges
196f1ddc5e Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-04 12:12:49 +13:00
KorPhaeron
380413fb8b Ports dash weapons to the dash datum (#31222) 
* Dash katanas

* Properly assign the action

* Speaking of copypaste

* Its own file
 2017-10-04 12:10:39 +13:00
ShizCalev
2b89790dcb Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:06 -05:00
kingofkosmos
2e63bd3dbe Adds deconstruction hints for beds, chairs, closets, grilles, lattices, catwalks, tables, racks, floors, plating and the bookcase. Plus few span fixes. 2017-10-03 18:39:07 +03:00
Leo
f4dd50156e Merge pull request #31233 from kevinz000/patch-306 
Fixes floating bullet holes
 2017-10-03 08:18:02 -03:00
kevinz000
f8c8d43974 Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 11:37:16 +02:00
vuonojenmustaturska
d1a1495925 makes /turf/Enter() faster, and also makes CollidedWith async (#31217) 
* makes /turf/Enter faster, maybe

* waitfor false on atom/collidedwith
 2017-10-03 11:32:58 +02:00
oranges
23d8387f96 Merge pull request #31225 from KorPhaeron/multiz_swarmers 
Swarmers work with multiz stations
 2017-10-03 16:05:11 +13:00
Robustin
92193ed933 Removed random newlines 2017-10-02 15:11:08 -04:00
Robustin
9772ac1817 Bastard Sword Soul Fix 2017-10-02 14:58:37 -04:00
kevinz000
1a360a971c Update closed.dm 2017-10-02 03:12:52 -07:00
ShizCalev
f82adb7238 Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 09:48:42 +02:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
KorPhaeron
4178b702cf Swarmers work with multiz stations 2017-10-01 19:55:39 -05:00
ShizCalev
c64b11b446 Fixes gen scanner timer 2017-10-01 17:03:07 -05:00
bawhoppen
3e4d747b77 Adds desc to things lacking them. (#31086) 
* Desc change

* Update girders.dm

* Update valve.dm

* Update machine_stacking.dm

* Update shuttle_engines.dm

* Update pipe_dispenser.dm

* Update lib_items.dm
 2017-10-02 09:07:10 +13:00