cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,205 Commits 61 Branches 14 Tags
67fdbfbaafd5d6b20ca6a0619a67e5f2bfa5e48b
Commit Graph

2656 Commits

Author SHA1 Message Date
Cheridan
c4aebda258 Merge pull request #3421 from GunHog/AI_Lockdown 
Gives Malfuncting AIs the Hostile Lockdown ability!
 2014-06-06 12:17:53 -05:00
Alex
9b083e95ac Merge pull request #3841 from ike709/2014-06-04-#3788-Fix 
Fixes #3788 Animals retaliating after death
 2014-06-06 09:17:36 +01:00
ike709
a6aca7617f Removed useless changes from first commit. 2014-06-05 20:33:07 -05:00
ike709
8708a65016 None of the animals should retaliate while dead. 2014-06-05 20:19:19 -05:00
ike709
85de677d1b Fixed issue #3788. Message "[src] gets an evil-looking gleam in \his eye" no longer displays when Pete is dead. 2014-06-04 01:12:29 -05:00
ikarrus
8e94bff33c -Giacom's Feeback 
-Belt, ID, and Pockets are no longer blocked by exosuits, as they are still visible
 2014-06-02 21:07:21 -06:00
ikarrus
ce35503695 Greyed out empty slots for easier readability 2014-06-01 22:45:28 -06:00
ikarrus
8cd20b3e77 Added checks in Topic() 2014-06-01 21:12:06 -06:00
ikarrus
5a7db48f96 Improved readability of the strip panel with <BR>s 2014-05-31 14:26:48 -06:00
ikarrus
e47b75c02f Strip Menu now obscures items based on flags_inv 
I also made it look pretty
 2014-05-31 13:45:14 -06:00
Cheridan
47eeeefe31 Merge pull request #3731 from Ikarrus/internalshelp 
You can now set internals on someone else's belt and suit storage
 2014-05-31 11:43:47 -05:00
Ikarrus
26813fc6ac What is this it shouldn't be here. 
It's gone now
 2014-05-25 11:15:41 -06:00
Ikarrus
769a220740 I honestly don't remember making these changes before 2014-05-25 11:10:52 -06:00
ikarrus
82b861702f Resolved Conflicts: 
code/modules/mob/living/simple_animal/constructs.dm
 2014-05-25 10:59:08 -06:00
Miauw62
97a25607ca Merge pull request #3748 from Cheridan/wizardDidIt 
Bugfixes
 2014-05-24 19:50:46 +02:00
Alex
aaec78f754 Merge pull request #3745 from Miauw62/autism_intensifies 
Fixed #3740, slimes now attack simple_animals in retaliation.
 2014-05-22 10:09:51 +01:00
Alex
2c577af52f Merge pull request #3741 from Rolan7/Issue3643-NoclientIcons 
Sets screenloc even if no client
 2014-05-22 10:04:21 +01:00
GunHog
130f9e86c3 Optimization changes 
Adds all doors to the "portals" list.
 2014-05-21 19:28:27 -05:00
Miauw
3cf8624665 Finalizes the fixes. 2014-05-20 20:14:01 +02:00
Cheridan
38ab0be4ad Spells are now anchored. 
Space Carp and Bears now take damage from high temperatures.
 2014-05-19 15:06:54 -05:00
Miauw
8ac429ab9c Made slimes able to feed on simple_animals. 2014-05-19 21:03:26 +02:00
Miauw
b5f61f59d3 Fixed #3740, slimes now attack simple_animals in retaliation. 2014-05-19 19:33:38 +02:00
Rolan7
92d138533f Added the fix to the back slot, had overlooked it. 2014-05-19 13:30:49 -04:00
Rolan7
992ec337e6 Put the hud_used.hud_shown checks back for hideable inventory slots, preventing the placed items from floating in empty space above the closed inventory. 2014-05-19 05:37:46 -04:00
Rolan7
31d69ef4f5 Sets the screenloc property for items in update_icons even if there's no client at the moment (possibly because the player has lost the connection temporarily). 2014-05-19 02:48:53 -04:00
Rolan7
a36afba82a Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)
 2014-05-18 20:50:38 -04:00
Kelenius
1d4a6c5d26 Merge branch 'master' into slimes 
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
 2014-05-18 21:38:25 +04:00
Kelenius
ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck 
Meteor Stuff
 2014-05-17 18:42:16 -05:00
ikarrus
4926933e41 You can now set internals on someone else's belt and suit storage 2014-05-17 15:24:07 -06:00
Cheridan
86e36fb934 Merge pull request #3598 from phil235/ConstructHitFix 
Stops constructs from hitting themselves
 2014-05-15 12:56:38 -05:00
Cheridan
a016d1463a Merge pull request #3608 from hornygranny/lookmanohands 
Fixes #3157
 2014-05-15 12:50:22 -05:00
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck 
Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-13 14:03:42 -05:00
Ikarrus
20aec66a26 Extra period 2014-05-10 20:17:10 -06:00
ikarrus
995338c21d -Added attack cooldown for space vines and simple animals 
-Reduced some duplicate code in constructs.dm
 2014-05-10 18:16:35 -06:00
Kelenius
d41ee9ee8a Why the hell not 2014-05-11 00:47:16 +04:00
Rolan7
d871779432 Replaced the isRobot() check with two new functions, one of which is overloaded for robots. Object oriented programming intensifies! 2014-05-09 18:03:49 -04:00
Rolan7
5b219ea119 Fixes issue #146, borgs placing modules on people 
Simple fix for this one...
 2014-05-07 14:54:35 -04:00
Rolan7
f2493b4c37 Makes trays a subclass of bag. 
This somewhat changes how items are placed on them, but for the better as it's more consistent with existing mechanics.
Hitting someone with the tray still scatters the contents around!  Works on nonhumans.
Placing icons on the tray still makes them show up on the tray.  Using the tray on a table now places the items onto the table, or places the tray itself if it's empty.  Robots can't lose their tray this way, I checked.
Service borgs can actually use their tray to carry things!  Trays can hold all sorts of stuff, as long as it's small...
A service borg can carry the nuke disk around.  The pinpointer does follow it correctly.
If the service borg stashes its tray module, dies, explodes, gibselfs, or is forced to stash its modules by damage, it drops all the tray's contents on the ground.

Fixes #236 (service borgs can't use trays) and #2991 (Items on food trays can't be picked up).  Didn't address #1919, the layer issue.

Fixes the "bajillion lines changed" with the maps.
 2014-05-07 13:04:22 -04:00
Alex
8a731f3bdc Merge pull request #3568 from Giacom/rip_cyborg_inventory_bugs 
Fixes #3565. Added a "put_in_hand_check" which returns 1 if the item can be equipped ...
 2014-05-06 20:07:49 +01:00
Alex
38b56975f5 Merge pull request #3591 from Aranclanos/ghostize 
Mindless ghosts fix
 2014-05-06 08:14:46 +01:00
Razharas
282a5d3a2b Merge pull request #3379 from Cheridan/sliceofpai 
Refactors pAI law code...
 2014-05-05 07:33:17 -07:00
Alex
923802cd71 Merge pull request #3619 from Ikarrus/fix3590 
Runtime fix for putting someone in a human mob before the round starts
 2014-05-03 23:10:00 +01:00
Miauw62
eec72aa516 Merge pull request #3472 from Menshin/missing_nodrop 
Nodrop  checks for several machines/structures
 2014-05-03 15:44:26 +02:00
ikarrus
d0380956a4 Runtime fix for putting someone in a human mob before the round starts 
Fixes #3590
 2014-05-01 20:29:03 -06:00
Hornygranny
237cabd1c5 removed old code 2014-05-01 17:55:12 -07:00
Hornygranny
4fd7a6312d Moved check for magboots to human_movement 2014-05-01 17:48:56 -07:00
Kelenius
45bb631363 Two small fixes 2014-05-01 22:25:41 +04:00
Kelenius
dc70e962f9 Fix for them having a frozen face upon death 2014-05-01 15:41:27 +04:00
Kelenius
59e19ed3f8 ALMOST FORGOT 2014-05-01 15:25:20 +04:00