cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,400 Commits 74 Branches 23 Tags
df1f62a54cf180d2f77d1efc60e2d7ceb3cdb46c
Commit Graph

634 Commits

Author SHA1 Message Date
LordFowl
8254478a3f Fixes to Rnd MkII (#653) 
Fixes #648
 2016-07-31 01:07:58 +03:00
LordFowl
a076766115 New Item RndFixes (#628) 2016-07-24 02:25:31 +03:00
Alberyk
60f4bee6c1 Alberyk dev fixes (#571) 
Fixing some wrong path in robotic modules and missing right ear slot contained sprites.
 2016-07-14 01:47:28 +03:00
skull132
67310b42db Fixing Dumbs (#561) 
Reverts baystation12.int that I fucked up
Adds a config toggle to host the dev server without clogging up SQL tables
 2016-07-12 15:48:18 +03:00
Alberyk
5f8c2fde3c Adding rig modules to robotics (#546) 
This allows you to print hardsuit modules in robotics, if you have enough tech and materials.
 2016-07-11 16:51:12 +03:00
skull132
443a49a49b Merge branch 'master' into development 2016-07-10 14:25:54 -04:00
LordFowl
43a3ba3d1b Fixes RnD to Include New Weapons (#482) 2016-07-09 03:15:48 +03:00
NanakoAC
b6eee04dac Welding Tool tweaks (#517) 
Welding tools can now be used to burn paper
The upgraded and experimental welding tools will now fit in a toolbelt. Upgraded renamed to advanced.
Fixed and implemented the Experimental Welding Tool, which has a regenerating fuel supply. Can be produced in R&D, requires 4 research in engineering and materials.
 2016-07-05 22:59:21 +03:00
ArcBot
9a11c728a8 Fixes spectrometer not accepting coolant 2016-05-15 16:37:20 -04:00
skull132
8b5c7bc2c5 Conflict resolution 
Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt
 2016-03-25 22:25:41 +02:00
skull132
3d3dbcb8f0 JMP logs for days 
Adds JMP messages to most forms of physical attacks.
 2016-03-25 18:27:37 +02:00
skull132
8383f1c03b Generalizing establish_db_connection() and setup_database_connection() 
Both procs are now generalized, and accept a DBConnection object as an argument. Due to this generalization, all instances of `establish_db_connection()` must be renamed to `establish_db_connection(dbcon)`.
Also added variable `failed_connections` to the definition of DBConnection.
 2016-03-04 00:53:37 +02:00
skull132
fcd393ee94 Merge pull request #33 from skull132/SQL-backend-import 
Sql backend import
 2016-02-01 16:11:10 +02:00
skull132
179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import 
# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.
 2016-02-01 16:00:54 +02:00
skull132
253ca5a295 Merge remote-tracking branch 'Lady_of_ravens/gloves' 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous.dm
#	code/modules/research/designs.dm

All conflicts cleared.
 2016-01-28 01:44:28 +02:00
skull132
4c0867c922 Merge pull request #22 from Ryan784/Lawgiver-1.0 
Lawgiver
 2016-01-24 23:12:44 +02:00
skull132
df009a3307 Merge pull request #3 from skull132/telescience-import 
Telescience import
 2016-01-24 23:11:09 +02:00
FelisCorax
e2f63626f3 Stungloves, forcegloves, and watches, oh my! 2016-01-15 14:00:26 -05:00
Ryan784
92c1ab268c Lawgiver reinstated 
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
 2016-01-14 16:54:26 -05:00
skull132
c7ae4df416 dbcon_old removal, table prefixing 
Prefixes the tables properly with ss13_, and removes active references to dbcon_old and related procs.
 2016-01-13 15:59:36 +02:00
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00
GinjaNinja32
8e1928062b sulphuric acid is "sacid" not "acid" 2015-11-20 21:41:31 +00:00
GinjaNinja32
11141462a0 fix #11222 
also fixes the name and adds feedback to adding items
 2015-09-30 00:00:36 +01:00
skull132
1a92ff92cf Module import 2015-09-17 13:55:54 +03:00
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
mwerezak
8f4394266b Fixes not being able to insert a complete stack into the protolathe 
The call order meant that if you tried to insert a complete stack, use()
would qdel the stack causing do_after() to fail.
 2015-08-02 00:26:30 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
PsiOmega
b308e34388 Fixes #10170. 
Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.
 2015-07-18 22:51:20 +02:00
PsiOmegaDelta
23736bc42b Merge pull request #10233 from Baystation12/master 
Master -> Dev-freeze.
 2015-07-18 22:45:44 +02:00
PsiOmega
8aac45bc42 Fixes #10170. 
Overrides the AI attack proc.
Saving any  removal of burners for the dev branch due to merge concerns.
 2015-07-18 19:36:01 +02:00
Kelenius
4c8dfcf17e Fixes #10127, fixes #10139 
Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
 2015-07-15 16:49:22 +03:00
Zuhayr
2a32150658 Merge pull request #9992 from Baystation12/master 
Master into dev-freeze
 2015-07-02 19:00:00 +09:30
GinjaNinja32
7b1d9a54be Fixes the third teleportation effect 
why isn't this a proc
 2015-07-02 06:36:30 +01:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e Refactor floodlights 
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
 2015-05-28 21:45:54 +02:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Chinsky
8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping 
Makes bear traps do damage when stepped on
 2015-05-19 01:43:05 +03:00
PsiOmega
c16d033b18 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-17 11:30:04 +02:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30
Zuhayr
83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
PsiOmega
21dad8bdc0 Teleport anomaly fix. 
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
 2015-05-16 14:46:57 +02:00
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr
e1a14e3c41 Removes xenoarch reconstitutors entirely. "Fixes" #5413 2015-05-16 17:40:49 +09:30
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00