Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
56e1fbe0a6
Fixes improperly cherry-picked files.
2016-03-21 17:51:26 -04:00
PsiOmegaDelta
e7686dd3e7
Camera fixes and performance tweaks.
...
Improves camera EMP handling. Now uses a var and processing to determine when the EMP should end, preventing inconsistent states when a camera is EMPd multiple times.
Reduces the process and bandwidth need for cameras.
* There is now a common camera repository, responsible for setting up cameras once for every invalidation.
* Camera consoles now only updates when the camera cache is invalidated, not every second.
* The console now only presents one network at a time, and only sends the data necessary to view that network (as opposed to sending the data for all cameras).
2016-03-21 17:30:52 -04:00
Kelenius
c615077568
Merge branch 'master' into oldTurrets
2016-03-21 11:32:26 +03:00
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
141962b22f
Adds lizard, visitors and intrigue game modes.
2016-03-16 11:11:44 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Neerti
ccb6f5bd60
Merge pull request #1132 from Hubblenaut/laundry
...
Laundry Basket
2016-03-14 08:40:43 -04:00
EmperorJon
7734092d85
Merge pull request #1160 from Mark9013100/3/11/2016nomoreslides
...
Removes the need for slides in forensics
2016-03-11 21:00:48 +00:00
Mark9013100
905bda9b2d
Removes the need for slides in forensics
2016-03-11 03:53:12 -05:00
Kelenius
974a2a8216
Removes splash code
...
Unused
2016-03-10 10:55:35 +03:00
Hubblenaut
51a6241fdd
Merge remote-tracking branch 'upstream/master' into laundry
2016-03-09 15:56:16 +01:00
Hubblenaut
f122902b84
Adds laundry basket
...
Conflicts:
icons/mob/items/lefthand.dmi
icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Neerti
2420ed3867
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor
2016-03-06 04:19:33 -05:00
Neerti
d4793de3a0
Adds a bunch of stuff for sec armor. See PR for details.
2016-03-06 04:18:39 -05:00
Neerti
b4b8d94723
Merge pull request #1015 from Zuhayr/xenosremove
...
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti
6224e978a9
Merge pull request #1014 from Zuhayr/voxremove
...
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Kelenius
b9a9a7eb88
Merge branch 'master' into botFixes
2016-03-01 14:48:24 +03:00
Neerti
69140184b3
Fixes ID computers.
...
Also fixes what appears to be a merge error in condiments, which made my compiler complain.
oh, someone also added FILE_DIR previously, as well. Fixed that too.
2016-02-28 08:08:23 -05:00
Neerti
23b15390dd
Merge pull request #893 from Kelenius/AIHud
...
AI hud
2016-02-26 20:31:40 -05:00
Datraen
9fdce4ec34
Merge pull request #988 from Zuhayr/cards
...
Cards Against The Galaxy.
2016-02-26 14:39:59 -05:00
Kelenius
b7d0818e27
Removes unused code - old turrets
...
Removes /obj/machinery/turret (by the looks of if they wouldn't fire
anyway)
Removes /obj/machinery/turretcover
Removes /area/turret_protected (new turrets don't use it), its
associated procs, changes areas from /area/turret_protected/x to area/x
2016-02-25 15:08:30 +03:00
Zuhayr
7d83a629b0
Added Cards Against The Galaxy.
2016-02-22 09:40:02 +10:30
Hubblenaut
67884b97b5
Adds cash registers and retail scanners
2016-02-21 16:46:56 +01:00
Zuhayr
cbc506fd51
Removed xenomorphs.
2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
Zuhayr
7453414faa
Added new panel for loadout.
2016-02-09 00:09:39 +10:30
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16
Merge pull request #810 from Zuhayr/bayupdate
...
Bay update.
2016-02-05 23:21:07 -05:00
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
Kelenius
906b03e736
Gives AI the hud, sorts the verbs
...
Removes 'AI IM' category
Adds 'AI settings' category
Unnecessary verbs are hidden by default but can be shown/hidden again by
using a verb
2016-02-05 17:21:04 +03:00
Kelenius
cf244e07d6
Mulebots are now mobs
...
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
Kelenius
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
58736fb4f6
Renaming Resomi to Seromi.
2016-01-27 14:24:09 +10:30
Zuhayr
eef9145486
Revert "Removes Resomi."
...
This reverts commit c9f579e00a
2016-01-27 13:48:48 +10:30
Zuhayr
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
Kearel
5727971690
Semi ports Baystation12/Baystation12#11445
2016-01-25 20:35:52 +00:00
Jon
706d720757
Fight me etc.
2016-01-24 00:35:23 +00:00
Zuhayr
1c100bf457
Cleaning up post-merge.
2016-01-22 01:22:49 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Zuhayr
51deb6cd7e
Made old IPC icons into a mask slot item for prosthetic heads.
2016-01-05 16:20:42 +10:30
Datraen
37e1913fda
Creates telecrystal item for exchanging telecrystals between antags.
2016-01-03 01:22:48 -05:00
GinjaNinja32
9dee0707e8
Merge remote-tracking branch 'polaris/master' into pl-chemistry
2015-12-24 15:06:16 +00:00
Neerti
084ba448fa
Merge pull request #652 from Zuhayr/nerf
...
Added Nerf weapons to Cargo.
2015-12-24 06:47:48 -05:00
Zuhayr
e555c8432f
Merge pull request #640 from Neerti/12/21/2015_event_tweaks
...
Random Event Tweaks
2015-12-24 22:11:19 +10:30
Zuhayr
996eecde3c
Ticks foam weapon file.
2015-12-24 22:05:10 +10:30
GinjaNinja32
9c267539a3
Merge remote-tracking branch 'polaris/master' into pl-chemistry
2015-12-22 02:55:31 +00:00
